Merge remote-tracking branch 'origin/master'

# Conflicts:
#	application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/upms/controller/SysDeptController.java
#	application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/upms/controller/SysPostController.java
#	application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/upms/service/SysDeptService.java
#	application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/upms/service/SysPostService.java
#	application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/upms/service/impl/SysDeptServiceImpl.java
#	application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/upms/service/impl/SysPostServiceImpl.java

api/src/main/java/com/ankaibei/workflow/vo/SysUser.java

@@ -16,7 +16,7 @@ public class SysUser {
     private static final long serialVersionUID = 1L;
 
    // 主键id
-    private String id;
+   private Long id;
 
     // 用户名
     private String username;
@@ -40,8 +40,8 @@ public class SysUser {
     //"头像地址"
     private String headUrl;
 
-    //"公司id"
-    private String deptId;
+ //"公司id"
+ private Long deptId;
 
     // 描述
     private String description;

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

@@ -179,7 +179,8 @@ public class ProjectTeamController {
     @RequestMapping("/findPrincipal")
     public ResMsg findPrincipal() {
 
-        return projectTeamApi.findPrincipal();
+        ResMsg principal = projectTeamApi.findPrincipal();
+        return principal;
     }
 
     /**

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

@@ -1,5 +1,6 @@
 package com.ankaibei.workFlow.webadmin.ankaibei.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.ankaibei.workFlow.webadmin.ankaibei.entity.ProjectInfoEntity;
 import com.ankaibei.workFlow.webadmin.ankaibei.entity.ProjectTeamInfoEntity;
 import com.ankaibei.workFlow.webadmin.ankaibei.entity.RelevanceProjectInfoEntity;
@@ -11,6 +12,7 @@ import com.ankaibei.workFlow.webadmin.ankaibei.mapper.RelevanceProjectInfoMapper
 import com.ankaibei.workFlow.webadmin.ankaibei.mapper.UserInfoMapper;
 import com.ankaibei.workFlow.webadmin.ankaibei.service.ProjectTeamService;
 import com.ankaibei.workFlow.webadmin.ankaibei.vo.ResMsg;
+import com.ankaibei.workFlow.webadmin.ankaibei.vo.WorkSysUserVo;
 import com.ankaibei.workFlow.webadmin.upms.controller.SysUserController;
 import com.ankaibei.workFlow.webadmin.upms.vo.SysUserVo;
 import org.apache.commons.lang3.StringUtils;
@@ -156,7 +158,8 @@ public class ProjectTeamServiceImpl implements ProjectTeamService {
     @Override
     public ResMsg findPrincipal() {
         List<Map<String, String>> byUserDutyEquals = userInfoMapper.getProUserAll();
-        return new ResMsg(CodeEnum.OK, byUserDutyEquals);
+        List<WorkSysUserVo> workSysUserVoList = JSON.parseArray(JSON.toJSONString(byUserDutyEquals), WorkSysUserVo.class);
+        return new ResMsg(CodeEnum.OK, workSysUserVoList);
     }
 
     @Override

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

@@ -26,6 +26,7 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.*;
@@ -75,6 +76,7 @@ public class TaskInfoServiceImpl implements TaskInfoService {
     }
 
     @Override
+    @Transactional
     public ResMsg addTaskInfo(TaskInfoEntity taskInfoEntity, List<Long> taskParticipant) {
         if (taskInfoMapper.countByTargetTaskEqualsAndIsDeleteEquals(taskInfoEntity.getTargetTask(), "1") > 1) {
             return new ResMsg(CodeEnum.TASK_ALREADY_EXISTS);

application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/ankaibei/vo/WorkSysUserVo.java

@@ -0,0 +1,15 @@
+package com.ankaibei.workFlow.webadmin.ankaibei.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author Administrator
+ */
+@Data
+public class WorkSysUserVo implements Serializable {
+
+    private String userId;
+    private String userName;
+}

application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/app/util/FlowIdentityExtHelper.java

@@ -42,14 +42,14 @@ public class FlowIdentityExtHelper implements BaseFlowIdentityExtHelper {
     }
 
     @Override
-    public String getLeaderDeptPostId(String deptId) {
-        List<String> deptPostIdList = sysDeptService.getLeaderDeptPostIdList(deptId);
+    public Long getLeaderDeptPostId(Long deptId) {
+        List<Long> deptPostIdList = sysDeptService.getLeaderDeptPostIdList(deptId);
         return CollUtil.isEmpty(deptPostIdList) ? null : deptPostIdList.get(0);
     }
 
     @Override
-    public String getUpLeaderDeptPostId(String deptId) {
-        List<String> deptPostIdList = sysDeptService.getUpLeaderDeptPostIdList(deptId);
+    public Long getUpLeaderDeptPostId(Long deptId) {
+        List<Long> deptPostIdList = sysDeptService.getUpLeaderDeptPostIdList(deptId);
         return CollUtil.isEmpty(deptPostIdList) ? null : deptPostIdList.get(0);
     }
 
@@ -126,8 +126,8 @@ public class FlowIdentityExtHelper implements BaseFlowIdentityExtHelper {
     @Override
     public Set<String> getUsernameListByDeptIds(Set<String> deptIdSet) {
         Set<String> usernameSet = new HashSet<>();
-        Set<String> deptIdSet2 = deptIdSet.stream().map(String::valueOf).collect(Collectors.toSet());
-        for (String deptId : deptIdSet2) {
+        Set<Long> deptIdSet2 = deptIdSet.stream().map(Long::valueOf).collect(Collectors.toSet());
+        for (Long deptId : deptIdSet2) {
             SysUser filter = new SysUser();
             filter.setDeptId(deptId);
             filter.setUserStatus(SysUserStatus.STATUS_NORMAL);
@@ -140,8 +140,8 @@ public class FlowIdentityExtHelper implements BaseFlowIdentityExtHelper {
     @Override
     public List<FlowUserInfoVo> getUserInfoListByDeptIds(Set<String> deptIdSet) {
         List<FlowUserInfoVo> resultList = new LinkedList<>();
-        Set<String> deptIdSet2 = deptIdSet.stream().map(String::valueOf).collect(Collectors.toSet());
-        for (String deptId : deptIdSet2) {
+        Set<Long> deptIdSet2 = deptIdSet.stream().map(Long::valueOf).collect(Collectors.toSet());
+        for (Long deptId : deptIdSet2) {
             SysUser filter = new SysUser();
             filter.setDeptId(deptId);
             filter.setUserStatus(SysUserStatus.STATUS_NORMAL);

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

@@ -199,7 +199,7 @@ public class LoginController {
             permCodeList = sysPermCodeService.getAllPermCodeList();
         } else {
             menuList = sysMenuService.getMenuListByUserId(tokenData.getUserId());
-            permCodeList = sysPermCodeService.getPermCodeListByUserId(tokenData.getUserId().toString());
+            permCodeList = sysPermCodeService.getPermCodeListByUserId(tokenData.getUserId());
         }
         menuList = menuList.stream().filter(m -> m.getMenuType() <= SysMenuType.TYPE_MENU).collect(Collectors.toList());
         jsonData.put("menuList", menuList);
@@ -351,8 +351,8 @@ public class LoginController {
         if (!isAdmin) {
             permSet.addAll(onlinePermData.permUrlSet);
             // 缓存用户的权限资源
-            sysPermService.putUserSysPermCache(sessionId, Long.parseLong(user.getUserId()), permSet);
-            sysDataPermService.putDataPermCache(sessionId, Long.parseLong(user.getUserId()), user.getDeptId());
+            sysPermService.putUserSysPermCache(sessionId, user.getUserId(), permSet);
+            sysDataPermService.putDataPermCache(sessionId, user.getUserId(), user.getDeptId());
         }
         return jsonData;
     }
@@ -371,14 +371,14 @@ public class LoginController {
         tokenData.setHeadImageUrl(user.getHeadImageUrl());
         List<SysUserPost> userPostList = sysPostService.getSysUserPostListByUserId(user.getUserId());
         if (CollUtil.isNotEmpty(userPostList)) {
-            Set<String> deptPostIdSet = userPostList.stream().map(SysUserPost::getDeptPostId).collect(Collectors.toSet());
+            Set<Long> deptPostIdSet = userPostList.stream().map(SysUserPost::getDeptPostId).collect(Collectors.toSet());
             tokenData.setDeptPostIds(StrUtil.join(",", deptPostIdSet));
-            Set<String> postIdSet = userPostList.stream().map(SysUserPost::getPostId).collect(Collectors.toSet());
+            Set<Long> postIdSet = userPostList.stream().map(SysUserPost::getPostId).collect(Collectors.toSet());
             tokenData.setPostIds(StrUtil.join(",", postIdSet));
         }
         List<SysUserRole> userRoleList = sysRoleService.getSysUserRoleListByUserId(user.getUserId());
         if (CollUtil.isNotEmpty(userRoleList)) {
-            Set<String> userRoleIdSet = userRoleList.stream().map(SysUserRole::getRoleId).collect(Collectors.toSet());
+            Set<Long> userRoleIdSet = userRoleList.stream().map(SysUserRole::getRoleId).collect(Collectors.toSet());
             tokenData.setRoleIds(StrUtil.join(",", userRoleIdSet));
         }
         return tokenData;

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

@@ -60,7 +60,7 @@ public class SysDataPermController {
             "sysDataPermDto.searchString"})
     @OperationLog(type = SysOperationLogType.ADD)
     @PostMapping("/add")
-    public ResponseResult<String> add(
+    public ResponseResult<Long> add(
             @MyRequestBody SysDataPermDto sysDataPermDto,
             @MyRequestBody String deptIdListString,
             @MyRequestBody String menuIdListString) {
@@ -144,7 +144,7 @@ public class SysDataPermController {
      */
     @OperationLog(type = SysOperationLogType.DELETE)
     @PostMapping("/delete")
-    public ResponseResult<Void> delete(@MyRequestBody String dataPermId) {
+    public ResponseResult<Void> delete(@MyRequestBody Long dataPermId) {
         if (MyCommonUtil.existBlankArgument(dataPermId)) {
             return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
         }
@@ -280,12 +280,12 @@ public class SysDataPermController {
     @OperationLog(type = SysOperationLogType.ADD_M2M)
     @PostMapping("/addDataPermUser")
     public ResponseResult<Void> addDataPermUser(
-            @MyRequestBody String dataPermId, @MyRequestBody String userIdListString) {
+            @MyRequestBody Long dataPermId, @MyRequestBody String userIdListString) {
         if (MyCommonUtil.existBlankArgument(dataPermId, userIdListString)) {
             return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
         }
-        Set<String> userIdSet =
-                Arrays.stream(userIdListString.split(",")).map(String::valueOf).collect(Collectors.toSet());
+        Set<Long> userIdSet =
+                Arrays.stream(userIdListString.split(",")).map(Long::valueOf).collect(Collectors.toSet());
         if (!sysDataPermService.existId(Long.valueOf(dataPermId))
                 || !sysUserService.existUniqueKeyList("userId", userIdSet)) {
             return ResponseResult.error(ErrorCodeEnum.INVALID_RELATED_RECORD_ID);
@@ -304,7 +304,7 @@ public class SysDataPermController {
     @OperationLog(type = SysOperationLogType.DELETE_M2M)
     @PostMapping("/deleteDataPermUser")
     public ResponseResult<Void> deleteDataPermUser(
-            @MyRequestBody String dataPermId, @MyRequestBody String userId) {
+            @MyRequestBody Long dataPermId, @MyRequestBody Long userId) {
         if (MyCommonUtil.existBlankArgument(dataPermId, userId)) {
             return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
         }

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

@@ -116,7 +116,7 @@ public class SysDeptController {
      */
     @OperationLog(type = SysOperationLogType.DELETE)
     @PostMapping("/delete")
-    public ResponseResult<Void> delete(@MyRequestBody Long deptId) {
+    public ResponseResult<Void> delete(@MyRequestBody String deptId) {
         if (MyCommonUtil.existBlankArgument(deptId)) {
             return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
         }
@@ -202,11 +202,11 @@ public class SysDeptController {
      * @return 应答结果对象，包含对象详情。
      */
     @GetMapping("/view")
-    public ResponseResult<SysDeptVo> view(@RequestParam String deptId) {
+    public ResponseResult<SysDeptVo> view(@RequestParam Long deptId) {
         if (MyCommonUtil.existBlankArgument(deptId)) {
             return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
         }
-        SysDept sysDept = sysDeptService.getByIdWithRelation(Long.valueOf(deptId), MyRelationParam.full());
+        SysDept sysDept = sysDeptService.getByIdWithRelation(deptId, MyRelationParam.full());
         if (sysDept == null) {
             return ResponseResult.error(ErrorCodeEnum.DATA_NOT_EXIST);
         }
@@ -283,7 +283,7 @@ public class SysDeptController {
      */
     @PostMapping("/addSysDeptPost")
     public ResponseResult<Void> addSysDeptPost(
-            @MyRequestBody Long deptId,
+            @MyRequestBody String deptId,
             @MyRequestBody List<SysDeptPostDto> sysDeptPostDtoList) {
         if (MyCommonUtil.existBlankArgument(deptId, sysDeptPostDtoList)) {
             return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
@@ -292,8 +292,8 @@ public class SysDeptController {
         if (errorMessage != null) {
             return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
         }
-        Set<String> postIdSet = sysDeptPostDtoList.stream().map(SysDeptPostDto::getPostId).collect(Collectors.toSet());
-        if (!sysDeptService.existId(deptId) || !sysPostService.existUniqueKeyList("postId", postIdSet)) {
+        Set<Long> postIdSet = sysDeptPostDtoList.stream().map(SysDeptPostDto::getPostId).collect(Collectors.toSet());
+        if (!sysDeptService.existId(Long.valueOf(deptId)) || !sysPostService.existUniqueKeyList("postId", postIdSet)) {
             return ResponseResult.error(ErrorCodeEnum.INVALID_RELATED_RECORD_ID);
         }
         List<SysDeptPost> sysDeptPostList = MyModelUtil.copyCollectionTo(sysDeptPostDtoList, SysDeptPost.class);
@@ -308,7 +308,7 @@ public class SysDeptController {
      * @return 应答结果对象。
      */
     @PostMapping("/updateSysDeptPost")
-    public ResponseResult<Void> updateSysDeptPost(@MyRequestBody SysDeptPostDto sysDeptPostDto) {
+    public ResponseResult<Void> updateSysDeptPost(@RequestBody SysDeptPostDto sysDeptPostDto) {
         String errorMessage = MyCommonUtil.getModelValidationError(sysDeptPostDto);
         if (errorMessage != null) {
             return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
@@ -427,7 +427,7 @@ public class SysDeptController {
         return ResponseResult.success(sysDeptService.getAllChildDeptIdByParentIds(parentIdList));
     }
 
-    private ResponseResult<Void> doDelete(Long deptId) {
+    private ResponseResult<Void> doDelete(String deptId) {
         String errorMessage;
         // 验证关联Id的数据合法性
         SysDept originalSysDept = sysDeptService.getById(deptId);

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

@@ -95,7 +95,7 @@ public class SysPostController {
      */
     @OperationLog(type = SysOperationLogType.DELETE)
     @PostMapping("/delete")
-    public ResponseResult<Void> delete(@MyRequestBody Long postId) {
+    public ResponseResult<Void> delete(@RequestBody String postId) {
         String errorMessage;
         if (MyCommonUtil.existBlankArgument(postId)) {
             return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);

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

@@ -57,7 +57,7 @@ public class SysRoleController {
     @ApiOperationSupport(ignoreParameters = {"sysRoleDto.roleId", "sysRoleDto.createTimeStart", "sysRoleDto.createTimeEnd"})
     @OperationLog(type = SysOperationLogType.ADD)
     @PostMapping("/add")
-    public ResponseResult<String> add(
+    public ResponseResult<Long> add(
             @MyRequestBody SysRoleDto sysRoleDto, @MyRequestBody String menuIdListString) {
         String errorMessage = MyCommonUtil.getModelValidationError(sysRoleDto);
         if (errorMessage != null) {
@@ -68,9 +68,9 @@ public class SysRoleController {
         if (!result.isSuccess()) {
             return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, result.getErrorMessage());
         }
-        Set<String> menuIdSet = null;
+        Set<Long> menuIdSet = null;
         if (result.getData() != null) {
-            menuIdSet = result.getData().getObject("menuIdSet", new TypeReference<Set<String>>() {
+            menuIdSet = result.getData().getObject("menuIdSet", new TypeReference<Set<Long>>() {
             });
         }
         sysRoleService.saveNew(sysRole, menuIdSet);
@@ -103,7 +103,7 @@ public class SysRoleController {
         if (!result.isSuccess()) {
             return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, result.getErrorMessage());
         }
-        Set<String> menuIdSet = null;
+        Set<Long> menuIdSet = null;
         if (result.getData() != null) {
             menuIdSet = result.getData().getObject("menuIdSet", new TypeReference<Set<String>>() {
             });
@@ -123,7 +123,7 @@ public class SysRoleController {
      */
     @OperationLog(type = SysOperationLogType.DELETE)
     @PostMapping("/delete")
-    public ResponseResult<Void> delete(@MyRequestBody String roleId) {
+    public ResponseResult<Void> delete(@MyRequestBody Long roleId) {
         if (MyCommonUtil.existBlankArgument(roleId)) {
             return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
         }
@@ -257,18 +257,18 @@ public class SysRoleController {
     @OperationLog(type = SysOperationLogType.ADD_M2M)
     @PostMapping("/addUserRole")
     public ResponseResult<Void> addUserRole(
-            @MyRequestBody String roleId, @MyRequestBody String userIdListString) {
+            @MyRequestBody Long roleId, @MyRequestBody String userIdListString) {
         if (MyCommonUtil.existBlankArgument(roleId, userIdListString)) {
             return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
         }
-        Set<String> userIdSet = Arrays.stream(
-                userIdListString.split(",")).map(String::valueOf).collect(Collectors.toSet());
+        Set<Long> userIdSet = Arrays.stream(
+                userIdListString.split(",")).map(Long::valueOf).collect(Collectors.toSet());
         if (!sysRoleService.existId(Long.valueOf(roleId))
                 || !sysUserService.existUniqueKeyList("userId", userIdSet)) {
             return ResponseResult.error(ErrorCodeEnum.INVALID_RELATED_RECORD_ID);
         }
         List<SysUserRole> userRoleList = new LinkedList<>();
-        for (String userId : userIdSet) {
+        for (Long userId : userIdSet) {
             SysUserRole userRole = new SysUserRole();
             userRole.setRoleId(roleId);
             userRole.setUserId(userId);
@@ -288,7 +288,7 @@ public class SysRoleController {
     @OperationLog(type = SysOperationLogType.DELETE_M2M)
     @PostMapping("/deleteUserRole")
     public ResponseResult<Void> deleteUserRole(
-            @MyRequestBody String roleId, @MyRequestBody String userId) {
+            @MyRequestBody Long roleId, @MyRequestBody Long userId) {
         if (MyCommonUtil.existBlankArgument(roleId, userId)) {
             return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
         }

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

@@ -188,8 +188,8 @@ public class SysUserController {
             PageMethod.startPage(sysUserDtoFilter.getPageNum(), sysUserDtoFilter.getPageSize());
         }
         SysUser sysUserFilter = MyModelUtil.copyTo(sysUserDtoFilter, SysUser.class);
-        List<SysUser> sysUserList = sysUserService.getSysUserListWithRelation(sysUserFilter);
-        return ResMsg.newInstance(CodeEnum.OK, MyPageUtil.makeResponseData(sysUserList, SysUser.INSTANCE));
+        List<SysUserVo> sysUserList = sysUserService.getSysUserListWithRelation(sysUserFilter);
+        return ResMsg.newInstance(CodeEnum.OK, MyPageUtil.makeResponseData(sysUserList));
     }
 
     /**

application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/upms/dao/SysDeptPostMapper.java

@@ -29,5 +29,5 @@ public interface SysDeptPostMapper extends BaseDaoMapper<SysDeptPost> {
      * @param deptId 部门Id。
      * @return 指定部门Id的领导部门岗位列表
      */
-    List<SysDeptPost> getLeaderDeptPostList(@Param("deptId") String deptId);
+    List<SysDeptPost> getLeaderDeptPostList(@Param("deptId") Long deptId);
 }

application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/upms/dao/SysDeptRelationMapper.java

@@ -21,7 +21,7 @@ public interface SysDeptRelationMapper extends BaseDaoMapper<SysDeptRelation> {
      * @param myDeptId      当前部门。
      */
     void removeBetweenChildrenAndParents(
-            @Param("parentDeptIds") List<String> parentDeptIds, @Param("myDeptId") String myDeptId);
+            @Param("parentDeptIds") List<Long> parentDeptIds, @Param("myDeptId") Long myDeptId);
 
     /**
      * 批量插入部门关联数据。
@@ -38,5 +38,5 @@ public interface SysDeptRelationMapper extends BaseDaoMapper<SysDeptRelation> {
      * @param parentDeptId myDeptId的父部门Id。
      * @param myDeptId     当前部门。
      */
-    void insertParentList(@Param("parentDeptId") String parentDeptId, @Param("myDeptId") String myDeptId);
+    void insertParentList(@Param("parentDeptId") Long parentDeptId, @Param("myDeptId") Long myDeptId);
 }

application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/upms/dao/SysPermCodeMapper.java

@@ -21,7 +21,7 @@ public interface SysPermCodeMapper extends BaseDaoMapper<SysPermCode> {
      * @param userId 用户Id。
      * @return 该用户的权限字列表。
      */
-    List<String> getPermCodeListByUserId(@Param("userId") String userId);
+    List<String> getPermCodeListByUserId(@Param("userId") Long userId);
 
     /**
      * 查询权限字的用户列表。同时返回详细的分配路径。

application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/upms/dao/SysUserMapper.java

@@ -158,7 +158,7 @@ public interface SysUserMapper extends BaseDaoMapper<SysUser> {
      * @param deptId
      * @return
      */
-    List<SysUser> getSysUsersByDeptId(@Param("deptId") String deptId);
+    List<SysUser> getSysUsersByDeptId(@Param("deptId") Long deptId);
 
     /**
      * 查询使用该号码的用户
@@ -175,7 +175,7 @@ public interface SysUserMapper extends BaseDaoMapper<SysUser> {
      * @param userId 用户id
      * @return
      */
-    List<SysUser> getSysUsersByMobileOfTheir(@Param("mobile") String mobile, @Param("userId") String userId);
+    List<SysUser> getSysUsersByMobileOfTheir(@Param("mobile") String mobile, @Param("userId") Long userId);
 
     /**
      * 查询使用该工号的用户
@@ -192,7 +192,7 @@ public interface SysUserMapper extends BaseDaoMapper<SysUser> {
      * @param userId    用户id
      * @return
      */
-    List<SysUser> getSysUsersByJobNumberOfTheir(@Param("jobNumber") String jobNumber, @Param("userId") String userId);
+    List<SysUser> getSysUsersByJobNumberOfTheir(@Param("jobNumber") String jobNumber, @Param("userId") Long userId);
 
     /**
      * 查询使用该邮箱的用户
@@ -209,7 +209,7 @@ public interface SysUserMapper extends BaseDaoMapper<SysUser> {
      * @param userId 用户id
      * @return
      */
-    List<SysUser> getSysUsersByEmailOfTheir(@Param("email") String email, @Param("userId") String userId);
+    List<SysUser> getSysUsersByEmailOfTheir(@Param("email") String email, @Param("userId") Long userId);
 
 }
 

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

@@ -7,6 +7,7 @@ import com.ankaibei.workFlow.common.core.validator.ConstDictRef;
 import com.ankaibei.workFlow.webadmin.upms.model.constant.SysUserType;
 import com.ankaibei.workFlow.webadmin.upms.model.constant.SysUserStatus;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -136,6 +137,7 @@ public class SysUserDto extends MyPageParam {
     @ApiModelProperty(value = "createTime 范围过滤结束值(<=)")
     private String createTimeEnd;
 
+    @TableField(exist = false)
     @ApiModelProperty(value = "逗号分隔的部门岗位Id列表")
     private String deptPostIdListString;
 }

application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/upms/model/SysDataPerm.java

@@ -26,7 +26,7 @@ public class SysDataPerm {
      * 主键Id。
      */
     @TableId(value = "data_perm_id")
-    private String dataPermId;
+    private Long dataPermId;
 
     /**
      * 显示名称。

application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/upms/model/SysDataPermDept.java

@@ -19,11 +19,11 @@ public class SysDataPermDept {
      * 数据权限Id。
      */
     @TableField(value = "data_perm_id")
-    private String dataPermId;
+    private Long dataPermId;
 
     /**
      * 关联部门Id。
      */
     @TableField(value = "dept_id")
-    private String deptId;
+    private Long deptId;
 }

application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/upms/model/SysDataPermMenu.java

@@ -20,11 +20,11 @@ public class SysDataPermMenu {
      * 数据权限Id。
      */
     @TableField(value = "data_perm_id")
-    private String dataPermId;
+    private Long dataPermId;
 
     /**
      * 关联菜单Id。
      */
     @TableField(value = "menu_id")
-    private String menuId;
+    private Long menuId;
 }

application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/upms/model/SysDataPermUser.java

@@ -17,11 +17,11 @@ public class SysDataPermUser {
      * 数据权限Id。
      */
     @TableField(value = "data_perm_id")
-    private String dataPermId;
+    private Long dataPermId;
 
     /**
      * 用户Id。
      */
     @TableField(value = "user_id")
-    private String userId;
+    private Long userId;
 }

application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/upms/model/SysDept.java

@@ -25,7 +25,7 @@ public class SysDept {
      * 部门Id。
      */
     @TableId(value = "dept_id")
-    private String deptId;
+    private Long deptId;
 
     /**
      * 部门名称。
@@ -39,12 +39,12 @@ public class SysDept {
     @TableField(value = "show_order")
     private Integer showOrder;
 
+
     /**
      * 父部门Id。
      */
     @TableField(value = "parent_id")
-    private String parentId;
-
+    private Long parentId;
     /**
      * 逻辑删除标记字段(1: 正常 -1: 已删除)。
      */

application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/upms/model/SysDeptPost.java

@@ -17,19 +17,25 @@ public class SysDeptPost {
      * 部门岗位Id。
      */
     @TableId(value = "dept_post_id")
-    private String deptPostId;
+    private Long deptPostId;
+
+    /**
+     * 部门岗位Id。
+     */
+    @TableField(exist = false)
+    private String deptPostIds;
 
     /**
      * 部门Id。
      */
     @TableField(value = "dept_id")
-    private String deptId;
+    private Long deptId;
 
     /**
      * 岗位Id。
      */
     @TableField(value = "post_id")
-    private String postId;
+    private Long postId;
 
     /**
      * 部门岗位显示名称。

application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/upms/model/SysDeptRelation.java

@@ -21,11 +21,11 @@ public class SysDeptRelation {
      * 上级部门Id。
      */
     @TableField(value = "parent_dept_id")
-    private String parentDeptId;
+    private Long parentDeptId;
 
     /**
      * 部门Id。
      */
     @TableField(value = "dept_id")
-    private String deptId;
+    private Long deptId;
 }

application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/upms/model/SysPost.java

@@ -7,6 +7,7 @@ import lombok.Data;
 import org.mapstruct.*;
 import org.mapstruct.factory.Mappers;
 
+import java.io.Serializable;
 import java.util.Date;
 
 /**
@@ -17,7 +18,7 @@ import java.util.Date;
  */
 @Data
 @TableName(value = "work_sys_post")
-public class SysPost {
+public class SysPost implements Serializable {
 
     /**
      * 岗位Id。

application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/upms/model/SysRole.java

@@ -25,7 +25,7 @@ public class SysRole {
      * 角色Id。
      */
     @TableId(value = "role_id")
-    private String roleId;
+    private Long roleId;
 
     /**
      * 角色名称。

application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/upms/model/SysRoleMenu.java

@@ -17,11 +17,11 @@ public class SysRoleMenu {
      * 角色Id。
      */
     @TableField(value = "role_id")
-    private String roleId;
+    private Long roleId;
 
     /**
      * 菜单Id。
      */
     @TableField(value = "menu_id")
-    private String menuId;
+    private Long menuId;
 }

application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/upms/model/SysUser.java

@@ -29,7 +29,7 @@ public class SysUser {
      * 用户Id。
      */
     @TableId(value = "user_id")
-    private String userId;
+    private Long userId;
 
     /**
      * 登录用户名。
@@ -52,7 +52,7 @@ public class SysUser {
      * 用户部门Id。
      */
     @TableField(value = "dept_id")
-    private String deptId;
+    private Long deptId;
 
     /**
      * 用户类型(0: 管理员 1: 系统管理用户 2: 系统业务用户)。

application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/upms/model/SysUserPost.java

@@ -17,17 +17,17 @@ public class SysUserPost {
      * 用户Id。
      */
     @TableField(value = "user_id")
-    private String userId;
+    private Long userId;
 
     /**
      * 部门岗位Id。
      */
     @TableField(value = "dept_post_id")
-    private String deptPostId;
+    private Long deptPostId;
 
     /**
      * 岗位Id。
      */
     @TableField(value = "post_id")
-    private String postId;
+    private Long postId;
 }

application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/upms/model/SysUserRole.java

@@ -17,11 +17,11 @@ public class SysUserRole {
      * 用户Id。
      */
     @TableField(value = "user_id")
-    private String userId;
+    private Long userId;
 
     /**
      * 角色Id。
      */
     @TableField(value = "role_id")
-    private String roleId;
+    private Long roleId;
 }

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

@@ -41,7 +41,7 @@ public interface SysDataPermService extends IBaseService<SysDataPerm, Long> {
      * @param dataPermId 数据权限主键Id。
      * @return 删除成功返回true，否则false。
      */
-    boolean remove(String dataPermId);
+    boolean remove(Long dataPermId);
 
     /**
      * 获取数据权限列表及其关联数据。
@@ -59,7 +59,7 @@ public interface SysDataPermService extends IBaseService<SysDataPerm, Long> {
      * @param userId    用户主键Id。
      * @param deptId    用户所属部门主键Id。
      */
-    void putDataPermCache(String sessionId, Long userId, String deptId);
+    void putDataPermCache(String sessionId, Long userId, Long deptId);
 
     /**
      * 将指定会话的数据权限集合从缓存中移除。
@@ -75,7 +75,7 @@ public interface SysDataPermService extends IBaseService<SysDataPerm, Long> {
      * @param deptId 用户所属部门主键Id。
      * @return 合并优化后的数据权限列表。返回格式为，Map<MenuId, Map<RuleType, DeptIdString>>。
      */
-    Map<String, Map<Integer, String>> getSysDataPermListByUserId(Long userId, String deptId);
+    Map<String, Map<Integer, String>> getSysDataPermListByUserId(Long userId, Long deptId);
 
     /**
      * 查询与指定菜单关联的数据权限列表。
@@ -91,7 +91,7 @@ public interface SysDataPermService extends IBaseService<SysDataPerm, Long> {
      * @param dataPermId 数据权限Id。
      * @param userIdSet  关联的用户Id列表。
      */
-    void addDataPermUserList(String dataPermId, Set<String> userIdSet);
+    void addDataPermUserList(Long dataPermId, Set<Long> userIdSet);
 
     /**
      * 移除用户和数据权限之间的多对多关联关系。
@@ -100,7 +100,7 @@ public interface SysDataPermService extends IBaseService<SysDataPerm, Long> {
      * @param userId     用户主键Id。
      * @return true移除成功，否则false。
      */
-    boolean removeDataPermUser(String dataPermId, String userId);
+    boolean removeDataPermUser(Long dataPermId, Long userId);
 
     /**
      * 验证数据权限对象关联菜单数据是否都合法。

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

@@ -37,7 +37,7 @@ public interface SysDeptService extends IBaseService<SysDept, Long> {
      * @param deptId 主键Id。
      * @return 成功返回true，否则false。
      */
-    boolean remove(Long deptId);
+    boolean remove(String deptId);
 
     /**
      * 获取单表查询结果。由于没有关联数据查询，因此在仅仅获取单表数据的场景下，效率更高。
@@ -64,7 +64,7 @@ public interface SysDeptService extends IBaseService<SysDept, Long> {
      * @param deptId 主键Id。
      * @return 存在返回true，否则false。
      */
-    boolean hasChildren(Long deptId);
+    boolean hasChildren(String deptId);
 
     /**
      * 判断指定部门Id是否包含用户对象。
@@ -72,7 +72,7 @@ public interface SysDeptService extends IBaseService<SysDept, Long> {
      * @param deptId 部门主键Id。
      * @return 存在返回true，否则false。
      */
-    boolean hasChildrenUser(Long deptId);
+    boolean hasChildrenUser(String deptId);
 
     /**
      * 批量添加多对多关联关系。
@@ -80,7 +80,7 @@ public interface SysDeptService extends IBaseService<SysDept, Long> {
      * @param sysDeptPostList 多对多关联表对象集合。
      * @param deptId          主表Id。
      */
-    void addSysDeptPostList(List<SysDeptPost> sysDeptPostList, Long deptId);
+    void addSysDeptPostList(List<SysDeptPost> sysDeptPostList, String deptId);
 
     /**
      * 更新中间表数据。
@@ -97,7 +97,7 @@ public interface SysDeptService extends IBaseService<SysDept, Long> {
      * @param postId 从表Id。
      * @return 成功返回true，否则false。
      */
-    boolean removeSysDeptPost(Long deptId, Long postId);
+    boolean removeSysDeptPost(String deptId, String postId);
 
     /**
      * 获取中间表数据。
@@ -106,7 +106,7 @@ public interface SysDeptService extends IBaseService<SysDept, Long> {
      * @param postId 从表Id。
      * @return 中间表对象。
      */
-    SysDeptPost getSysDeptPost(Long deptId, Long postId);
+    SysDeptPost getSysDeptPost(String deptId, String postId);
 
     /**
      * 根据部门岗位Id获取部门岗位关联对象。

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

@@ -20,7 +20,7 @@ public interface SysPermCodeService extends IBaseService<SysPermCode, Long> {
      * @param userId 用户主键Id。
      * @return 用户关联的权限字列表。
      */
-    Collection<String> getPermCodeListByUserId(String userId);
+    Collection<String> getPermCodeListByUserId(Long userId);
 
     /**
      * 获取所有权限字数据列表，已去重。

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

@@ -37,35 +37,38 @@ public interface SysPostService extends IBaseService<SysPost, Long> {
      * @param postId 主键Id。
      * @return 成功返回true，否则false。
      */
-    boolean remove(Long postId);
+    boolean remove(String postId);
 
     /**
      * 获取单表查询结果。由于没有关联数据查询，因此在仅仅获取单表数据的场景下，效率更高。
      * 如果需要同时获取关联数据，请移步(getSysPostListWithRelation)方法。
      *
-     * @param filter 过滤对象。
+     * @param filter  过滤对象。
+     * @param orderBy 排序参数。
      * @return 查询结果集。
      */
-    List<SysPost> getSysPostList(SysPost filter);
+    List<SysPost> getSysPostList(SysPost filter, String orderBy);
 
     /**
      * 获取主表的查询结果，以及主表关联的字典数据和一对一从表数据，以及一对一从表的字典数据。
      * 该查询会涉及到一对一从表的关联过滤，或一对多从表的嵌套关联过滤，因此性能不如单表过滤。
      * 如果仅仅需要获取主表数据，请移步(getSysPostList)，以便获取更好的查询性能。
      *
-     * @param filter 主表过滤对象。
+     * @param filter  主表过滤对象。
+     * @param orderBy 排序参数。
      * @return 查询结果集。
      */
-    List<SysPost> getSysPostListWithRelation(SysPost filter);
+    List<SysPost> getSysPostListWithRelation(SysPost filter, String orderBy);
 
     /**
      * 在多对多关系中，当前Service的数据表为从表，返回不与指定主表主键Id存在对多对关系的列表。
      *
      * @param deptId  主表主键Id。
      * @param filter  从表的过滤对象。
+     * @param orderBy 排序参数。
      * @return 查询结果集。
      */
-    List<SysPost> getNotInSysPostListByDeptId(Long deptId, SysPost filter);
+    List<SysPost> getNotInSysPostListByDeptId(Long deptId, SysPost filter, String orderBy);
 
     /**
      * 获取指定部门的岗位列表。

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

@@ -22,7 +22,7 @@ public interface SysRoleService extends IBaseService<SysRole, Long> {
      * @param menuIdSet 菜单Id列表。
      * @return 新增后的角色对象。
      */
-    SysRole saveNew(SysRole role, Set<String> menuIdSet);
+    SysRole saveNew(SysRole role, Set<Long> menuIdSet);
 
     /**
      * 更新角色对象。
@@ -32,7 +32,7 @@ public interface SysRoleService extends IBaseService<SysRole, Long> {
      * @param menuIdSet    菜单Id列表。
      * @return 更新成功返回true，否则false。
      */
-    boolean update(SysRole role, SysRole originalRole, Set<String> menuIdSet);
+    boolean update(SysRole role, SysRole originalRole, Set<Long> menuIdSet);
 
     /**
      * 删除指定角色。
@@ -40,7 +40,7 @@ public interface SysRoleService extends IBaseService<SysRole, Long> {
      * @param roleId 角色主键Id。
      * @return 删除成功返回true，否则false。
      */
-    boolean remove(String roleId);
+    boolean remove(Long roleId);
 
     /**
      * 获取角色列表。
@@ -57,7 +57,7 @@ public interface SysRoleService extends IBaseService<SysRole, Long> {
      * @param userId 用户Id。
      * @return 用户角色对象列表。
      */
-    List<SysUserRole> getSysUserRoleListByUserId(String userId);
+    List<SysUserRole> getSysUserRoleListByUserId(Long userId);
 
     /**
      * 批量新增用户角色关联。
@@ -73,7 +73,7 @@ public interface SysRoleService extends IBaseService<SysRole, Long> {
      * @param userId 用户主键Id。
      * @return 移除成功返回true，否则false。
      */
-    boolean removeUserRole(String roleId, String userId);
+    boolean removeUserRole(Long roleId, Long userId);
 
     /**
      * 验证角色对象关联的数据是否都合法。

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

@@ -4,6 +4,7 @@ import com.ankaibei.workFlow.webadmin.ankaibei.entity.UserInfoEntity;
 import com.ankaibei.workFlow.webadmin.upms.model.*;
 import com.ankaibei.workFlow.common.core.object.CallResult;
 import com.ankaibei.workFlow.common.core.base.service.IBaseService;
+import com.ankaibei.workFlow.webadmin.upms.vo.SysUserVo;
 
 import java.util.*;
 
@@ -70,7 +71,7 @@ public interface SysUserService extends IBaseService<SysUser, String> {
      * @param userId 主键Id。
      * @return 成功返回true，否则false。
      */
-    boolean remove(String userId);
+    boolean remove(Long userId);
 
     /**
      * 获取单表查询结果。由于没有关联数据查询，因此在仅仅获取单表数据的场景下，效率更高。
@@ -90,7 +91,7 @@ public interface SysUserService extends IBaseService<SysUser, String> {
      * @param filter 主表过滤对象。
      * @return 查询结果集。
      */
-    List<SysUser> getSysUserListWithRelation(SysUser filter);
+    List<SysUserVo> getSysUserListWithRelation(SysUser filter);
 
     /**
      * 获取指定角色的用户列表。
@@ -208,7 +209,7 @@ public interface SysUserService extends IBaseService<SysUser, String> {
      * @param deptId 部门id
      * @return
      */
-    List<SysUser> getSysUsersByDeptId(String deptId);
+    List<SysUser> getSysUsersByDeptId(Long deptId);
 
     /**
      * 查询填写的邮箱、号码、工号是否已存在
@@ -229,6 +230,6 @@ public interface SysUserService extends IBaseService<SysUser, String> {
      * @param userId    用户Id。
      * @return
      */
-    String verifyContactDataOfTheir(String email, String mobile, String jobNumber, String userId);
+    String verifyContactDataOfTheir(String email, String mobile, String jobNumber, Long userId);
 
 }

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

@@ -77,7 +77,7 @@ public class SysDataPermServiceImpl extends BaseService<SysDataPerm, Long> imple
     @Transactional(rollbackFor = Exception.class)
     @Override
     public SysDataPerm saveNew(SysDataPerm dataPerm, Set<Long> deptIdSet, Set<Long> menuIdSet) {
-        dataPerm.setDataPermId(String.valueOf(idGenerator.nextLongId()));
+        dataPerm.setDataPermId(idGenerator.nextLongId());
         MyModelUtil.fillCommonsForInsert(dataPerm);
         sysDataPermMapper.insert(dataPerm);
         this.insertRelationData(dataPerm, deptIdSet, menuIdSet);
@@ -89,7 +89,7 @@ public class SysDataPermServiceImpl extends BaseService<SysDataPerm, Long> imple
     public boolean update(
             SysDataPerm dataPerm, SysDataPerm originalDataPerm, Set<Long> deptIdSet, Set<Long> menuIdSet) {
         MyModelUtil.fillCommonsForUpdate(dataPerm, originalDataPerm);
-        UpdateWrapper<SysDataPerm> uw = this.createUpdateQueryForNullValue(dataPerm, Long.valueOf(dataPerm.getDataPermId()));
+        UpdateWrapper<SysDataPerm> uw = this.createUpdateQueryForNullValue(dataPerm, dataPerm.getDataPermId());
         if (sysDataPermMapper.update(dataPerm, uw) != 1) {
             return false;
         }
@@ -111,7 +111,7 @@ public class SysDataPermServiceImpl extends BaseService<SysDataPerm, Long> imple
      */
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public boolean remove(String dataPermId) {
+    public boolean remove(Long dataPermId) {
         if (sysDataPermMapper.deleteById(dataPermId) != 1) {
             return false;
         }
@@ -135,7 +135,7 @@ public class SysDataPermServiceImpl extends BaseService<SysDataPerm, Long> imple
     }
 
     @Override
-    public void putDataPermCache(String sessionId, Long userId, String deptId) {
+    public void putDataPermCache(String sessionId, Long userId, Long deptId) {
         Map<String, Map<Integer, String>> menuDataPermMap = getSysDataPermListByUserId(userId, deptId);
         if (menuDataPermMap.size() > 0) {
             String dataPermSessionKey = RedisKeyUtil.makeSessionDataPermIdKey(sessionId);
@@ -157,11 +157,11 @@ public class SysDataPermServiceImpl extends BaseService<SysDataPerm, Long> imple
     }
 
     @Override
-    public Map<String, Map<Integer, String>> getSysDataPermListByUserId(Long userId, String deptId) {
+    public Map<String, Map<Integer, String>> getSysDataPermListByUserId(Long userId, Long deptId) {
         List<SysDataPerm> dataPermList = sysDataPermMapper.getSysDataPermListByUserId(userId);
         dataPermList.forEach(dataPerm -> {
             if (CollUtil.isNotEmpty(dataPerm.getDataPermDeptList())) {
-                Set<String> deptIdSet = dataPerm.getDataPermDeptList().stream()
+                Set<Long> deptIdSet = dataPerm.getDataPermDeptList().stream()
                         .map(SysDataPermDept::getDeptId).collect(Collectors.toSet());
                 dataPerm.setDeptIdListString(StrUtil.join(",", deptIdSet));
             }
@@ -178,7 +178,7 @@ public class SysDataPermServiceImpl extends BaseService<SysDataPerm, Long> imple
                         ApplicationConstant.DATA_PERM_ALL_MENU_ID, k -> new LinkedList<>()).add(dataPerm);
             }
         }
-        return this.mergeAndOptimizeDataPermRule(menuIdMap, Long.valueOf(deptId));
+        return this.mergeAndOptimizeDataPermRule(menuIdMap, deptId);
     }
 
     @Override
@@ -277,8 +277,8 @@ public class SysDataPermServiceImpl extends BaseService<SysDataPerm, Long> imple
      */
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public void addDataPermUserList(String dataPermId, Set<String> userIdSet) {
-        for (String userId : userIdSet) {
+    public void addDataPermUserList(Long dataPermId, Set<Long> userIdSet) {
+        for (Long userId : userIdSet) {
             SysDataPermUser dataPermUser = new SysDataPermUser();
             dataPermUser.setDataPermId(dataPermId);
             dataPermUser.setUserId(userId);
@@ -294,7 +294,7 @@ public class SysDataPermServiceImpl extends BaseService<SysDataPerm, Long> imple
      */
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public boolean removeDataPermUser(String dataPermId, String userId) {
+    public boolean removeDataPermUser(Long dataPermId, Long userId) {
         SysDataPermUser dataPermUser = new SysDataPermUser();
         dataPermUser.setDataPermId(dataPermId);
         dataPermUser.setUserId(userId);
@@ -332,7 +332,7 @@ public class SysDataPermServiceImpl extends BaseService<SysDataPerm, Long> imple
             for (Long deptId : deptIdSet) {
                 SysDataPermDept dataPermDept = new SysDataPermDept();
                 dataPermDept.setDataPermId(dataPerm.getDataPermId());
-                dataPermDept.setDeptId(String.valueOf(deptId));
+                dataPermDept.setDeptId(deptId);
                 sysDataPermDeptMapper.insert(dataPermDept);
             }
         }
@@ -340,7 +340,7 @@ public class SysDataPermServiceImpl extends BaseService<SysDataPerm, Long> imple
             for (Long menuId : menuIdSet) {
                 SysDataPermMenu dataPermMenu = new SysDataPermMenu();
                 dataPermMenu.setDataPermId(dataPerm.getDataPermId());
-                dataPermMenu.setMenuId(String.valueOf(menuId));
+                dataPermMenu.setMenuId(menuId);
                 sysDataPermMenuMapper.insert(dataPermMenu);
             }
         }

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

@@ -157,7 +157,7 @@ public class SysDeptServiceImpl extends BaseService<SysDept, Long> implements Sy
      */
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public boolean remove(Long deptId) {
+    public boolean remove(String deptId) {
         if (sysDeptMapper.deleteById(deptId) == 0) {
             return false;
         }
@@ -209,9 +209,9 @@ public class SysDeptServiceImpl extends BaseService<SysDept, Long> implements Sy
      * @return 存在返回true，否则false。
      */
     @Override
-    public boolean hasChildren(Long deptId) {
+    public boolean hasChildren(String deptId) {
         SysDept filter = new SysDept();
-        filter.setParentId(deptId + "");
+        filter.setParentId(deptId);
         return getCountByFilter(filter) > 0;
     }
 
@@ -222,9 +222,9 @@ public class SysDeptServiceImpl extends BaseService<SysDept, Long> implements Sy
      * @return 存在返回true，否则false。
      */
     @Override
-    public boolean hasChildrenUser(Long deptId) {
+    public boolean hasChildrenUser(String deptId) {
         SysUser sysUser = new SysUser();
-        sysUser.setDeptId(deptId + "");
+        sysUser.setDeptId(deptId);
         return sysUserService.getCountByFilter(sysUser) > 0;
     }
 
@@ -236,10 +236,10 @@ public class SysDeptServiceImpl extends BaseService<SysDept, Long> implements Sy
      */
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public void addSysDeptPostList(List<SysDeptPost> sysDeptPostList, Long deptId) {
+    public void addSysDeptPostList(List<SysDeptPost> sysDeptPostList, String deptId) {
         for (SysDeptPost sysDeptPost : sysDeptPostList) {
             sysDeptPost.setDeptPostId(idGenerator.nextLongId() + "");
-            sysDeptPost.setDeptId(deptId + "");
+            sysDeptPost.setDeptId(deptId);
             sysDeptPostMapper.insert(sysDeptPost);
         }
     }
@@ -272,10 +272,10 @@ public class SysDeptServiceImpl extends BaseService<SysDept, Long> implements Sy
      */
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public boolean removeSysDeptPost(Long deptId, Long postId) {
+    public boolean removeSysDeptPost(String deptId, String postId) {
         SysDeptPost filter = new SysDeptPost();
-        filter.setDeptId(deptId + "");
-        filter.setPostId(postId + "");
+        filter.setDeptId(deptId);
+        filter.setPostId(postId);
         return sysDeptPostMapper.delete(new QueryWrapper<>(filter)) > 0;
     }
 
@@ -287,10 +287,10 @@ public class SysDeptServiceImpl extends BaseService<SysDept, Long> implements Sy
      * @return 中间表对象。
      */
     @Override
-    public SysDeptPost getSysDeptPost(Long deptId, Long postId) {
+    public SysDeptPost getSysDeptPost(String deptId, String postId) {
         SysDeptPost filter = new SysDeptPost();
-        filter.setDeptId(deptId + "");
-        filter.setPostId(postId + "");
+        filter.setDeptId(deptId);
+        filter.setPostId(postId);
         return sysDeptPostMapper.selectOne(new QueryWrapper<>(filter));
     }
 
@@ -328,7 +328,7 @@ public class SysDeptServiceImpl extends BaseService<SysDept, Long> implements Sy
 
     @Override
     public List<String> getLeaderDeptPostIdList(String deptId) {
-        List<SysDeptPost> resultList = sysDeptPostMapper.getLeaderDeptPostList(deptId + "");
+        List<SysDeptPost> resultList = sysDeptPostMapper.getLeaderDeptPostList(deptId);
         return resultList.stream().map(SysDeptPost::getDeptPostId).collect(Collectors.toList());
     }
 

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

@@ -160,7 +160,7 @@ public class SysMenuServiceImpl extends BaseService<SysMenu, Long> implements Sy
             return false;
         }
         SysRoleMenu roleMenu = new SysRoleMenu();
-        roleMenu.setMenuId(String.valueOf(menuId));
+        roleMenu.setMenuId(menuId);
         sysRoleMenuMapper.delete(new QueryWrapper<>(roleMenu));
         SysMenuPermCode menuPermCode = new SysMenuPermCode();
         menuPermCode.setMenuId(menuId);

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

@@ -63,7 +63,7 @@ public class SysPermCodeServiceImpl extends BaseService<SysPermCode, Long> imple
      * @return 用户关联的权限字列表。
      */
     @Override
-    public Collection<String> getPermCodeListByUserId(String userId) {
+    public Collection<String> getPermCodeListByUserId(Long userId) {
         List<String> permCodeList = sysPermCodeMapper.getPermCodeListByUserId(userId);
         return new HashSet<>(permCodeList);
     }

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

@@ -93,16 +93,16 @@ public class SysPostServiceImpl extends BaseService<SysPost, Long> implements Sy
      */
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public boolean remove(Long postId) {
+    public boolean remove(String postId) {
         if (sysPostMapper.deleteById(postId) != 1) {
             return false;
         }
         // 开始删除多对多父表的关联
         SysUserPost sysUserPost = new SysUserPost();
-        sysUserPost.setPostId(String.valueOf(postId));
+        sysUserPost.setPostId(postId);
         sysUserPostMapper.delete(new QueryWrapper<>(sysUserPost));
         SysDeptPost sysDeptPost = new SysDeptPost();
-        sysDeptPost.setPostId(String.valueOf(postId));
+        sysDeptPost.setPostId(postId);
         sysDeptPostMapper.delete(new QueryWrapper<>(sysDeptPost));
         return true;
     }

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

@@ -64,14 +64,14 @@ public class SysRoleServiceImpl extends BaseService<SysRole, Long> implements Sy
      */
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public SysRole saveNew(SysRole role, Set<String> menuIdSet) {
-        role.setRoleId(String.valueOf(idGenerator.nextLongId()));
+    public SysRole saveNew(SysRole role, Set<Long> menuIdSet) {
+        role.setRoleId(idGenerator.nextLongId());
         MyModelUtil.fillCommonsForInsert(role);
         sysRoleMapper.insert(role);
         if (menuIdSet != null) {
-            for (String menuId : menuIdSet) {
+            for (Long menuId : menuIdSet) {
                 SysRoleMenu roleMenu = new SysRoleMenu();
-                roleMenu.setRoleId(String.valueOf(role.getRoleId()));
+                roleMenu.setRoleId(role.getRoleId());
                 roleMenu.setMenuId(menuId);
                 sysRoleMenuMapper.insert(roleMenu);
             }
@@ -89,7 +89,7 @@ public class SysRoleServiceImpl extends BaseService<SysRole, Long> implements Sy
      */
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public boolean update(SysRole role, SysRole originalRole, Set<String> menuIdSet) {
+    public boolean update(SysRole role, SysRole originalRole, Set<Long> menuIdSet) {
         MyModelUtil.fillCommonsForUpdate(role, originalRole);
         if (sysRoleMapper.updateById(role) != 1) {
             return false;
@@ -98,7 +98,7 @@ public class SysRoleServiceImpl extends BaseService<SysRole, Long> implements Sy
         deletedRoleMenu.setRoleId(role.getRoleId());
         sysRoleMenuMapper.delete(new QueryWrapper<>(deletedRoleMenu));
         if (menuIdSet != null) {
-            for (String menuId : menuIdSet) {
+            for (Long menuId : menuIdSet) {
                 SysRoleMenu roleMenu = new SysRoleMenu();
                 roleMenu.setRoleId(role.getRoleId());
                 roleMenu.setMenuId(menuId);
@@ -116,7 +116,7 @@ public class SysRoleServiceImpl extends BaseService<SysRole, Long> implements Sy
      */
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public boolean remove(String roleId) {
+    public boolean remove(Long roleId) {
         if (sysRoleMapper.deleteById(roleId) != 1) {
             return false;
         }
@@ -142,7 +142,7 @@ public class SysRoleServiceImpl extends BaseService<SysRole, Long> implements Sy
     }
 
     @Override
-    public List<SysUserRole> getSysUserRoleListByUserId(String userId) {
+    public List<SysUserRole> getSysUserRoleListByUserId(Long userId) {
         SysUserRole filter = new SysUserRole();
         filter.setUserId(userId);
         return sysUserRoleMapper.selectList(new QueryWrapper<>(filter));
@@ -170,7 +170,7 @@ public class SysRoleServiceImpl extends BaseService<SysRole, Long> implements Sy
      */
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public boolean removeUserRole(String roleId, String userId) {
+    public boolean removeUserRole(Long roleId, Long userId) {
         SysUserRole userRole = new SysUserRole();
         userRole.setRoleId(roleId);
         userRole.setUserId(userId);

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

@@ -3,6 +3,7 @@ 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.upms.vo.SysUserVo;
 import com.baomidou.mybatisplus.core.conditions.query.*;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.ankaibei.workFlow.webadmin.upms.service.*;
@@ -18,6 +19,7 @@ import com.ankaibei.workFlow.common.core.util.MyModelUtil;
 import com.ankaibei.workFlow.common.sequence.wrapper.IdGeneratorWrapper;
 import com.github.pagehelper.Page;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -92,7 +94,7 @@ public class SysUserServiceImpl extends BaseService<SysUser, String> implements
     @Transactional(rollbackFor = Exception.class)
     @Override
     public SysUser saveNew(SysUser user, Set<Long> roleIdSet, Set<Long> deptPostIdSet, Set<Long> dataPermIdSet) {
-        user.setUserId(String.valueOf(idGenerator.nextLongId()));
+        user.setUserId(idGenerator.nextLongId());
         user.setPassword(passwordEncoder.encode(user.getPassword()));
         user.setUserStatus(SysUserStatus.STATUS_NORMAL);
         user.setDeletedFlag(GlobalDeletedFlag.NORMAL);
@@ -103,7 +105,7 @@ public class SysUserServiceImpl extends BaseService<SysUser, String> implements
                 SysDeptPost deptPost = sysDeptService.getSysDeptPost(deptPostId);
                 SysUserPost userPost = new SysUserPost();
                 userPost.setUserId(user.getUserId());
-                userPost.setDeptPostId(String.valueOf(deptPostId));
+                userPost.setDeptPostId(deptPostId);
                 userPost.setPostId(deptPost.getPostId());
                 sysUserPostMapper.insert(userPost);
             }
@@ -112,14 +114,14 @@ public class SysUserServiceImpl extends BaseService<SysUser, String> implements
             for (Long roleId : roleIdSet) {
                 SysUserRole userRole = new SysUserRole();
                 userRole.setUserId(user.getUserId());
-                userRole.setRoleId(String.valueOf(roleId));
+                userRole.setRoleId(roleId);
                 sysUserRoleMapper.insert(userRole);
             }
         }
         if (CollUtil.isNotEmpty(dataPermIdSet)) {
             for (Long dataPermId : dataPermIdSet) {
                 SysDataPermUser dataPermUser = new SysDataPermUser();
-                dataPermUser.setDataPermId(String.valueOf(dataPermId));
+                dataPermUser.setDataPermId(dataPermId);
                 dataPermUser.setUserId(user.getUserId());
                 sysDataPermUserMapper.insert(dataPermUser);
             }
@@ -143,7 +145,7 @@ public class SysUserServiceImpl extends BaseService<SysUser, String> implements
         user.setLoginName(originalUser.getLoginName());
         user.setPassword(originalUser.getPassword());
         MyModelUtil.fillCommonsForUpdate(user, originalUser);
-        UpdateWrapper<SysUser> uw = this.createUpdateQueryForNullValue(user, user.getUserId());
+        UpdateWrapper<SysUser> uw = this.createUpdateQueryForNullValue(user, String.valueOf(user.getUserId()));
         if (sysUserMapper.update(user, uw) != 1) {
             return false;
         }
@@ -156,7 +158,7 @@ public class SysUserServiceImpl extends BaseService<SysUser, String> implements
                 SysDeptPost deptPost = sysDeptService.getSysDeptPost(deptPostId);
                 SysUserPost userPost = new SysUserPost();
                 userPost.setUserId(user.getUserId());
-                userPost.setDeptPostId(String.valueOf(deptPostId));
+                userPost.setDeptPostId(deptPostId);
                 userPost.setPostId(deptPost.getPostId());
                 sysUserPostMapper.insert(userPost);
             }
@@ -169,7 +171,7 @@ public class SysUserServiceImpl extends BaseService<SysUser, String> implements
             for (Long roleId : roleIdSet) {
                 SysUserRole userRole = new SysUserRole();
                 userRole.setUserId(user.getUserId());
-                userRole.setRoleId(String.valueOf(roleId));
+                userRole.setRoleId(roleId);
                 sysUserRoleMapper.insert(userRole);
             }
         }
@@ -180,7 +182,7 @@ public class SysUserServiceImpl extends BaseService<SysUser, String> implements
         if (CollUtil.isNotEmpty(dataPermIdSet)) {
             for (Long dataPermId : dataPermIdSet) {
                 SysDataPermUser dataPermUser = new SysDataPermUser();
-                dataPermUser.setDataPermId(String.valueOf(dataPermId));
+                dataPermUser.setDataPermId(dataPermId);
                 dataPermUser.setUserId(user.getUserId());
                 sysDataPermUserMapper.insert(dataPermUser);
             }
@@ -221,7 +223,7 @@ public class SysUserServiceImpl extends BaseService<SysUser, String> implements
      */
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public boolean remove(String userId) {
+    public boolean remove(Long userId) {
         if (sysUserMapper.deleteById(userId) == 0) {
             return false;
         }
@@ -259,12 +261,22 @@ public class SysUserServiceImpl extends BaseService<SysUser, String> implements
      * @return 查询结果集。
      */
     @Override
-    public List<SysUser> getSysUserListWithRelation(SysUser filter) {
-        List<SysUser> resultList = sysUserMapper.getSysUserList(filter);
+    public List<SysUserVo> getSysUserListWithRelation(SysUser filter) {
+        List<SysUser> list = sysUserMapper.getSysUserList(filter);
+        List<SysUserVo> resultList = new ArrayList<>();
         // 在缺省生成的代码中，如果查询结果resultList不是Page对象，说明没有分页，那么就很可能是数据导出接口调用了当前方法。
         // 为了避免一次性的大量数据关联，规避因此而造成的系统运行性能冲击，这里手动进行了分批次读取，开发者可按需修改该值。
-        int batchSize = resultList instanceof Page ? 0 : 1000;
-        this.buildRelationForDataList(resultList, MyRelationParam.normal(), batchSize);
+        int batchSize = list instanceof Page ? 0 : 1000;
+        this.buildRelationForDataList(list, MyRelationParam.normal(), batchSize);
+        for (SysUser user : list) {
+            SysUserVo userVo = new SysUserVo();
+            BeanUtils.copyProperties(user, userVo);
+            userVo.setUserId(user.getUserId() + "");
+            userVo.setDeptId(user.getDeptId() + "");
+            userVo.setCreateUserId(user.getCreateUserId() + "");
+            userVo.setUpdateUserId(user.getUpdateUserId() + "");
+            resultList.add(userVo);
+        }
         return resultList;
     }
 
@@ -421,7 +433,7 @@ public class SysUserServiceImpl extends BaseService<SysUser, String> implements
     }
 
     @Override
-    public List<SysUser> getSysUsersByDeptId(String deptId) {
+    public List<SysUser> getSysUsersByDeptId(Long deptId) {
         List<SysUser> userList = sysUserMapper.getSysUsersByDeptId(deptId);
         return userList;
     }
@@ -441,7 +453,7 @@ public class SysUserServiceImpl extends BaseService<SysUser, String> implements
     }
 
     @Override
-    public String verifyContactDataOfTheir(String email, String mobile, String jobNumber, String userId) {
+    public String verifyContactDataOfTheir(String email, String mobile, String jobNumber, Long userId) {
         if (sysUserMapper.getSysUsersByEmailOfTheir(email, userId).size() > 0) {
             return "该邮箱已被使用，请确认邮箱无误！";
         }

application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/upms/vo/SysUserVo.java

@@ -144,4 +144,6 @@ public class SysUserVo {
      */
     @ApiModelProperty(value = "userStatus 常量字典关联数据")
     private Map<String, Object> userStatusDictMap;
+
+
 }

application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/utils/JacksonConfiguration.java

@@ -0,0 +1,16 @@
+package com.ankaibei.workFlow.webadmin.utils;
+
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer;
+import org.springframework.context.annotation.Bean;
+
+public class JacksonConfiguration {
+    @Bean
+    public Jackson2ObjectMapperBuilderCustomizer jackson2ObjectMapperBuilderCustomizer() {
+
+        return jacksonObjectMapperBuilder -> jacksonObjectMapperBuilder
+                .serializerByType(Long.class, ToStringSerializer.instance)
+                .serializerByType(Long.TYPE, ToStringSerializer.instance);
+    }
+
+}

common/common-core/src/main/java/com/ankaibei/workFlow/common/core/object/TokenData.java

@@ -33,7 +33,7 @@ public class TokenData {
      * 用户所在部门Id。
      * 仅当系统支持uaa时可用，否则可以直接忽略该字段。保留该字段是为了保持单体和微服务通用代码部分的兼容性。
      */
-    private String deptId;
+    private Long deptId;
     /**
      * 用户所属岗位Id。多个岗位之间逗号分隔。仅当系统支持岗位时有值。
      */

common/common-flow/src/main/java/com/ankaibei/workFlow/common/flow/util/BaseFlowIdentityExtHelper.java

@@ -25,7 +25,7 @@ public interface BaseFlowIdentityExtHelper {
      * @param deptId 用户所在部门Id。
      * @return 当前用户部门领导所有的部门岗位Id。
      */
-    default String getLeaderDeptPostId(String deptId) {
+    default Long getLeaderDeptPostId(Long deptId) {
         return null;
     }
 
@@ -35,7 +35,7 @@ public interface BaseFlowIdentityExtHelper {
      * @param deptId 用户所在部门Id。
      * @return 当前用户上级部门领导所有的部门岗位Id。
      */
-    default String getUpLeaderDeptPostId(String deptId) {
+    default Long getUpLeaderDeptPostId(Long deptId) {
         return null;
     }