项目合成后的接口修改

application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/upms/controller/SysDeptController.java

@@ -80,7 +80,7 @@ public class SysDeptController {
      */
     @OperationLog(type = SysOperationLogType.UPDATE)
     @PostMapping("/update")
-    public ResponseResult<Void> update(@MyRequestBody SysDeptDto sysDeptDto) {
+    public ResponseResult<Void> update(@RequestBody SysDeptDto sysDeptDto) {
         String errorMessage = MyCommonUtil.getModelValidationError(sysDeptDto, true);
         if (errorMessage != null) {
             return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
@@ -117,7 +117,6 @@ public class SysDeptController {
     @OperationLog(type = SysOperationLogType.DELETE)
     @PostMapping("/delete")
     public ResponseResult<Void> delete(@MyRequestBody String deptId) {
-        String errorMessage;
         if (MyCommonUtil.existBlankArgument(deptId)) {
             return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
         }

application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/upms/controller/SysUserController.java

@@ -57,7 +57,6 @@ public class SysUserController {
      * 新增用户操作。
      *
      * @param sysUserDto           新增用户对象。
-     * @param deptPostIdListString 逗号分隔的部门岗位Id列表。
      * @return 应答结果对象，包含新增用户的主键Id。
      */
     @ApiOperationSupport(ignoreParameters = {
@@ -66,7 +65,7 @@ public class SysUserController {
             "sysUserDto.createTimeEnd"})
     @OperationLog(type = SysOperationLogType.ADD)
     @PostMapping("/add")
-    public ResponseResult<Long> add(@RequestBody SysUserDto sysUserDto, @RequestBody String deptPostIdListString) {
+    public ResponseResult<Long> add(@RequestBody SysUserDto sysUserDto) {
 
         //角色是查看全部，前台已取消对角色的控制   这里直接写死
         String roleIdListString = "1575681957692444672";
@@ -84,7 +83,7 @@ public class SysUserController {
         }
         SysUser sysUser = MyModelUtil.copyTo(sysUserDto, SysUser.class);
         CallResult result = sysUserService.verifyRelatedData(
-                sysUser, null, roleIdListString, deptPostIdListString, dataPermIdListString);
+                sysUser, null, roleIdListString, sysUserDto.getDeptPostIdListString(), dataPermIdListString);
         if (!result.isSuccess()) {
             return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, result.getErrorMessage());
         }
@@ -100,7 +99,6 @@ public class SysUserController {
      * 更新用户操作。
      *
      * @param sysUserDto           更新用户对象。
-     * @param deptPostIdListString 逗号分隔的部门岗位Id列表。
      * @return 应答结果对象。
      */
     @ApiOperationSupport(ignoreParameters = {
@@ -109,8 +107,7 @@ public class SysUserController {
     @OperationLog(type = SysOperationLogType.UPDATE)
     @PostMapping("/update")
     public ResponseResult<Void> update(
-            @MyRequestBody SysUserDto sysUserDto,
-            @MyRequestBody String deptPostIdListString) {
+            @RequestBody SysUserDto sysUserDto) {
         String errorMessage = MyCommonUtil.getModelValidationError(sysUserDto, true);
         if (errorMessage != null) {
             return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
@@ -130,7 +127,7 @@ public class SysUserController {
         //逗号分隔的数据权限Id列表，角色和权限都是只留了一个查看全部，直接写死
         String dataPermIdListString = "1578390989012209664";
         CallResult result = sysUserService.verifyRelatedData(
-                sysUser, originalUser, roleIdListString, deptPostIdListString, dataPermIdListString);
+                sysUser, originalUser, roleIdListString, sysUserDto.getDeptPostIdListString(), dataPermIdListString);
         if (!result.isSuccess()) {
             return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, result.getErrorMessage());
         }

application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/upms/dto/SysUserDto.java

@@ -135,4 +135,7 @@ public class SysUserDto extends MyPageParam {
      */
     @ApiModelProperty(value = "createTime 范围过滤结束值(<=)")
     private String createTimeEnd;
+
+    @ApiModelProperty(value = "逗号分隔的部门岗位Id列表")
+    private String deptPostIdListString;
 }

application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/upms/service/impl/SysUserServiceImpl.java

@@ -3,7 +3,6 @@ package com.ankaibei.workFlow.webadmin.upms.service.impl;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
-import com.ankaibei.workFlow.webadmin.ankaibei.entity.UserInfoEntity;
 import com.baomidou.mybatisplus.core.conditions.query.*;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.ankaibei.workFlow.webadmin.upms.service.*;

application-webadmin/src/main/resources/application.yml

@@ -119,8 +119,8 @@ swagger:
   basePackage: com.ankaibei.workFlow
   # 工程服务的基础包名。
   serviceBasePackage: com.ankaibei.workFlow.webadmin
-  title: 橙单单体服务工程
-  description: 橙单单体服务工程详情
+  title: 单体服务工程
+  description: 单体服务工程详情
   version: 1.0
 
 datafilter: