修改用户编辑按钮权限

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/controller/CoreResumptionConfigurationController.java

@@ -8,6 +8,7 @@ import com.xunmei.common.log.annotation.Log;
 import com.xunmei.common.log.enums.BusinessType;
 import com.xunmei.common.security.annotation.RequiresPermissions;
 import com.xunmei.core.resumption.domain.CoreResumptionConfiguration;
+import com.xunmei.core.resumption.dto.CoreResumptionConfigurationDTO;
 import com.xunmei.core.resumption.service.ICoreResumptionConfigurationService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -22,7 +23,7 @@ import java.util.List;
  * @author xunmei
  * @date 2023-09-14
  */
-@Api(tags = {"CoreResumptionConfiguration" })
+@Api(tags = {"CoreResumptionConfiguration"})
 @RestController
 @RequestMapping("/configuration")
 public class CoreResumptionConfigurationController extends BaseController {
@@ -41,7 +42,6 @@ public class CoreResumptionConfigurationController extends BaseController {
     }*/
 
 
-
     /**
      * 获取履职任务定时提醒详细信息
      */
@@ -57,10 +57,10 @@ public class CoreResumptionConfigurationController extends BaseController {
      */
     @ApiOperation(value = "新增CoreResumptionConfiguration")
     @RequiresPermissions("system:configuration:add")
-    @Log(title = "履职任务定时提醒" , businessType = BusinessType.INSERT)
+    @Log(title = "履职任务定时提醒", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody List<CoreResumptionConfiguration> coreResumptionConfiguration) {
-        return toAjax(coreResumptionConfigurationService.insertCoreResumptionConfiguration(coreResumptionConfiguration));
+    public AjaxResult add(@RequestBody CoreResumptionConfigurationDTO coreResumptionConfigurationDTO) {
+        return toAjax(coreResumptionConfigurationService.insertCoreResumptionConfiguration(coreResumptionConfigurationDTO));
     }
 
     /**
@@ -68,7 +68,7 @@ public class CoreResumptionConfigurationController extends BaseController {
      */
     @ApiOperation(value = "修改CoreResumptionConfiguration")
     @RequiresPermissions("system:configuration:edit")
-    @Log(title = "履职任务定时提醒" , businessType = BusinessType.UPDATE)
+    @Log(title = "履职任务定时提醒", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody CoreResumptionConfiguration coreResumptionConfiguration) {
         return toAjax(coreResumptionConfigurationService.updateCoreResumptionConfiguration(coreResumptionConfiguration));
@@ -79,7 +79,7 @@ public class CoreResumptionConfigurationController extends BaseController {
      */
     @ApiOperation(value = "删除CoreResumptionConfiguration")
     @RequiresPermissions("system:configuration:remove")
-    @Log(title = "履职任务定时提醒" , businessType = BusinessType.DELETE)
+    @Log(title = "履职任务定时提醒", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(coreResumptionConfigurationService.deleteCoreResumptionConfigurationByIds(ids));

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/dto/CoreResumptionConfigurationDTO.java

@@ -0,0 +1,15 @@
+package com.xunmei.core.resumption.dto;
+
+import com.xunmei.core.resumption.domain.CoreResumptionConfiguration;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author :LuoWei
+ * @date : 2023/9/15
+ */
+@Data
+public class CoreResumptionConfigurationDTO {
+    List<CoreResumptionConfiguration> coreResumptionConfiguration;
+}

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/service/ICoreResumptionConfigurationService.java

@@ -4,6 +4,7 @@ package com.xunmei.core.resumption.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.xunmei.common.core.web.page.TableDataInfo;
 import com.xunmei.core.resumption.domain.CoreResumptionConfiguration;
+import com.xunmei.core.resumption.dto.CoreResumptionConfigurationDTO;
 
 import java.util.List;
 
@@ -20,7 +21,7 @@ public interface ICoreResumptionConfigurationService extends IService<CoreResump
      * @param id 履职任务定时提醒主键
      * @return 履职任务定时提醒
      */
-     CoreResumptionConfiguration selectCoreResumptionConfigurationById(Long id);
+    CoreResumptionConfiguration selectCoreResumptionConfigurationById(Long id);
 
     /**
      * 查询履职任务定时提醒列表
@@ -36,7 +37,7 @@ public interface ICoreResumptionConfigurationService extends IService<CoreResump
      * @param coreResumptionConfiguration 履职任务定时提醒
      * @return 结果
      */
-    int insertCoreResumptionConfiguration(List<CoreResumptionConfiguration> coreResumptionConfiguration);
+    int insertCoreResumptionConfiguration(CoreResumptionConfigurationDTO coreResumptionConfiguration);
 
     /**
      * 修改履职任务定时提醒
@@ -68,5 +69,5 @@ public interface ICoreResumptionConfigurationService extends IService<CoreResump
      * @param coreResumptionConfiguration 查询条件对象
      * @return Page
      */
- //   TableDataInfo<CoreResumptionConfiguration> selectPage(CoreResumptionConfiguration coreResumptionConfiguration);
+    //   TableDataInfo<CoreResumptionConfiguration> selectPage(CoreResumptionConfiguration coreResumptionConfiguration);
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/service/impl/CoreResumptionConfigurationServiceImpl.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xunmei.common.core.utils.DateUtils;
 import com.xunmei.common.core.web.page.TableDataInfo;
 import com.xunmei.core.resumption.domain.CoreResumptionConfiguration;
+import com.xunmei.core.resumption.dto.CoreResumptionConfigurationDTO;
 import com.xunmei.core.resumption.mapper.CoreResumptionConfigurationMapper;
 import com.xunmei.core.resumption.service.ICoreResumptionConfigurationService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -93,9 +94,9 @@ public class CoreResumptionConfigurationServiceImpl extends ServiceImpl<CoreResu
      * @return 结果
      */
     @Override
-    public int insertCoreResumptionConfiguration(List<CoreResumptionConfiguration> coreResumptionConfiguration) {
+    public int insertCoreResumptionConfiguration(CoreResumptionConfigurationDTO coreResumptionConfiguration) {
         int insert = 0;
-        for (CoreResumptionConfiguration c : coreResumptionConfiguration) {
+        for (CoreResumptionConfiguration c : coreResumptionConfiguration.getCoreResumptionConfiguration()) {
             c.setCreateTime(DateUtils.getNowDate());
             insert = coreResumptionConfigurationMapper.insert(c);
             if (insert < 1) {

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysUserController.java

@@ -83,7 +83,7 @@ public class SysUserController extends BaseController {
         if (i >= 0) {
             String[] split = s.split(",");
             for (int l = 0; l < split.length - 1; l++) {
-                if (split[l].endsWith("管理人员")) {
+                if (split[l].endsWith("管理人员")||split[l].equals("超级管理员")) {
                     admin = true;
                     break;
                 }