ID统一用字符串

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

@@ -42,14 +42,14 @@ public class FlowIdentityExtHelper implements BaseFlowIdentityExtHelper {
     }
 
     @Override
-    public Long getLeaderDeptPostId(Long deptId) {
-        List<Long> deptPostIdList = sysDeptService.getLeaderDeptPostIdList(deptId);
+    public String getLeaderDeptPostId(String deptId) {
+        List<String> deptPostIdList = sysDeptService.getLeaderDeptPostIdList(deptId + "");
         return CollUtil.isEmpty(deptPostIdList) ? null : deptPostIdList.get(0);
     }
 
     @Override
-    public Long getUpLeaderDeptPostId(Long deptId) {
-        List<Long> deptPostIdList = sysDeptService.getUpLeaderDeptPostIdList(deptId);
+    public String getUpLeaderDeptPostId(String deptId) {
+        List<String> deptPostIdList = sysDeptService.getUpLeaderDeptPostIdList(deptId + "");
         return CollUtil.isEmpty(deptPostIdList) ? null : deptPostIdList.get(0);
     }
 
@@ -125,16 +125,14 @@ public class FlowIdentityExtHelper implements BaseFlowIdentityExtHelper {
 
     @Override
     public Set<String> getUsernameListByDeptIds(Set<String> deptIdSet) {
-        Set<String> usernameSet = new HashSet<>();
-        Set<Long> deptIdSet2 = deptIdSet.stream().map(Long::valueOf).collect(Collectors.toSet());
-        for (Long deptId : deptIdSet2) {
+        for (String deptId : deptIdSet) {
             SysUser filter = new SysUser();
             filter.setDeptId(deptId);
             filter.setUserStatus(SysUserStatus.STATUS_NORMAL);
             List<SysUser> userList = sysUserService.getSysUserList(filter, null);
-            this.extractAndAppendUsernameList(usernameSet, userList);
+            this.extractAndAppendUsernameList(deptIdSet, userList);
         }
-        return usernameSet;
+        return deptIdSet;
     }
 
     @Override
@@ -143,7 +141,7 @@ public class FlowIdentityExtHelper implements BaseFlowIdentityExtHelper {
         Set<Long> deptIdSet2 = deptIdSet.stream().map(Long::valueOf).collect(Collectors.toSet());
         for (Long deptId : deptIdSet2) {
             SysUser filter = new SysUser();
-            filter.setDeptId(deptId);
+            filter.setDeptId(deptId + "");
             filter.setUserStatus(SysUserStatus.STATUS_NORMAL);
             List<SysUser> userList = sysUserService.getSysUserList(filter, null);
             if (CollUtil.isNotEmpty(userList)) {

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

@@ -371,14 +371,14 @@ public class LoginController {
         tokenData.setHeadImageUrl(user.getHeadImageUrl());
         List<SysUserPost> userPostList = sysPostService.getSysUserPostListByUserId(user.getUserId());
         if (CollUtil.isNotEmpty(userPostList)) {
-            Set<Long> deptPostIdSet = userPostList.stream().map(SysUserPost::getDeptPostId).collect(Collectors.toSet());
+            Set<String> deptPostIdSet = userPostList.stream().map(SysUserPost::getDeptPostId).collect(Collectors.toSet());
             tokenData.setDeptPostIds(StrUtil.join(",", deptPostIdSet));
-            Set<Long> postIdSet = userPostList.stream().map(SysUserPost::getPostId).collect(Collectors.toSet());
+            Set<String> 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<Long> userRoleIdSet = userRoleList.stream().map(SysUserRole::getRoleId).collect(Collectors.toSet());
+            Set<String> 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<Long> add(
+    public ResponseResult<String> add(
             @MyRequestBody SysDataPermDto sysDataPermDto,
             @MyRequestBody String deptIdListString,
             @MyRequestBody String menuIdListString) {
@@ -73,12 +73,12 @@ public class SysDataPermController {
         if (!result.isSuccess()) {
             return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, result.getErrorMessage());
         }
-        Set<Long> deptIdSet = null;
+        Set<String> deptIdSet = null;
         if (result.getData() != null) {
             deptIdSet = result.getData().getObject("deptIdSet", new TypeReference<Set<Long>>() {
             });
         }
-        Set<Long> menuIdSet = null;
+        Set<String> menuIdSet = null;
         if (result.getData() != null) {
             menuIdSet = result.getData().getObject("menuIdSet", new TypeReference<Set<Long>>() {
             });
@@ -119,14 +119,14 @@ public class SysDataPermController {
         if (!result.isSuccess()) {
             return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, result.getErrorMessage());
         }
-        Set<Long> deptIdSet = null;
+        Set<String> deptIdSet = null;
         if (result.getData() != null) {
-            deptIdSet = result.getData().getObject("deptIdSet", new TypeReference<Set<Long>>() {
+            deptIdSet = result.getData().getObject("deptIdSet", new TypeReference<Set<String>>() {
             });
         }
-        Set<Long> menuIdSet = null;
+        Set<String> menuIdSet = null;
         if (result.getData() != null) {
-            menuIdSet = result.getData().getObject("menuIdSet", new TypeReference<Set<Long>>() {
+            menuIdSet = result.getData().getObject("menuIdSet", new TypeReference<Set<String>>() {
             });
         }
         if (!sysDataPermService.update(sysDataPerm, originalSysDataPerm, deptIdSet, menuIdSet)) {
@@ -148,7 +148,7 @@ public class SysDataPermController {
         if (MyCommonUtil.existBlankArgument(dataPermId)) {
             return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
         }
-        if (!sysDataPermService.remove(dataPermId)) {
+        if (!sysDataPermService.remove(dataPermId + "")) {
             String errorMessage = "数据操作失败，数据权限不存在，请刷新后重试！";
             return ResponseResult.error(ErrorCodeEnum.DATA_NOT_EXIST, errorMessage);
         }
@@ -284,13 +284,13 @@ public class SysDataPermController {
         if (MyCommonUtil.existBlankArgument(dataPermId, userIdListString)) {
             return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
         }
-        Set<Long> userIdSet =
-                Arrays.stream(userIdListString.split(",")).map(Long::valueOf).collect(Collectors.toSet());
+        Set<String> userIdSet =
+                Arrays.stream(userIdListString.split(",")).map(String::valueOf).collect(Collectors.toSet());
         if (!sysDataPermService.existId(Long.valueOf(dataPermId))
                 || !sysUserService.existUniqueKeyList("userId", userIdSet)) {
             return ResponseResult.error(ErrorCodeEnum.INVALID_RELATED_RECORD_ID);
         }
-        sysDataPermService.addDataPermUserList(dataPermId, userIdSet);
+        sysDataPermService.addDataPermUserList(dataPermId + "", userIdSet);
         return ResponseResult.success();
     }
 

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<Long> add(
+    public ResponseResult<String> 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<Long> menuIdSet = null;
+        Set<String> menuIdSet = null;
         if (result.getData() != null) {
-            menuIdSet = result.getData().getObject("menuIdSet", new TypeReference<Set<Long>>() {
+            menuIdSet = result.getData().getObject("menuIdSet", new TypeReference<Set<String>>() {
             });
         }
         sysRoleService.saveNew(sysRole, menuIdSet);
@@ -103,7 +103,7 @@ public class SysRoleController {
         if (!result.isSuccess()) {
             return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, result.getErrorMessage());
         }
-        Set<Long> menuIdSet = null;
+        Set<String> menuIdSet = null;
         if (result.getData() != null) {
             menuIdSet = result.getData().getObject("menuIdSet", new TypeReference<Set<String>>() {
             });
@@ -127,7 +127,7 @@ public class SysRoleController {
         if (MyCommonUtil.existBlankArgument(roleId)) {
             return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
         }
-        if (!sysRoleService.remove(roleId)) {
+        if (!sysRoleService.remove(roleId + "")) {
             String errorMessage = "数据操作失败，角色不存在，请刷新后重试！";
             return ResponseResult.error(ErrorCodeEnum.DATA_NOT_EXIST, errorMessage);
         }
@@ -270,8 +270,8 @@ public class SysRoleController {
         List<SysUserRole> userRoleList = new LinkedList<>();
         for (Long userId : userIdSet) {
             SysUserRole userRole = new SysUserRole();
-            userRole.setRoleId(roleId);
-            userRole.setUserId(userId);
+            userRole.setRoleId(roleId + "");
+            userRole.setUserId(userId + "");
             userRoleList.add(userRole);
         }
         sysRoleService.addUserRoleList(userRoleList);
@@ -292,7 +292,7 @@ public class SysRoleController {
         if (MyCommonUtil.existBlankArgument(roleId, userId)) {
             return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
         }
-        if (!sysRoleService.removeUserRole(roleId, userId)) {
+        if (!sysRoleService.removeUserRole(roleId + "", userId + "")) {
             return ResponseResult.error(ErrorCodeEnum.DATA_NOT_EXIST);
         }
         return ResponseResult.success();

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

@@ -31,7 +31,7 @@ public interface SysDataPermMapper extends BaseDaoMapper<SysDataPerm> {
      * @param userId 用户Id。
      * @return 数据权限列表。
      */
-    List<SysDataPerm> getSysDataPermListByUserId(@Param("userId") Long userId);
+    List<SysDataPerm> getSysDataPermListByUserId(@Param("userId") String userId);
 
     /**
      * 查询与指定菜单关联的数据权限列表。

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") Long userId);
+    List<String> getPermCodeListByUserId(@Param("userId") String userId);
 
     /**
      * 查询权限字的用户列表。同时返回详细的分配路径。

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

@@ -22,7 +22,7 @@ public interface SysDataPermService extends IBaseService<SysDataPerm, Long> {
      * @param menuIdSet 关联的菜单Id列表。
      * @return 新增后的数据权限对象。
      */
-    SysDataPerm saveNew(SysDataPerm dataPerm, Set<Long> deptIdSet, Set<Long> menuIdSet);
+    SysDataPerm saveNew(SysDataPerm dataPerm, Set<String> deptIdSet, Set<String> menuIdSet);
 
     /**
      * 更新数据权限对象。
@@ -33,7 +33,7 @@ public interface SysDataPermService extends IBaseService<SysDataPerm, Long> {
      * @param menuIdSet        关联的菜单Id列表。
      * @return 更新成功返回true，否则false。
      */
-    boolean update(SysDataPerm dataPerm, SysDataPerm originalDataPerm, Set<Long> deptIdSet, Set<Long> menuIdSet);
+    boolean update(SysDataPerm dataPerm, SysDataPerm originalDataPerm, Set<String> deptIdSet, Set<String> menuIdSet);
 
     /**
      * 删除指定数据权限。
@@ -41,7 +41,7 @@ public interface SysDataPermService extends IBaseService<SysDataPerm, Long> {
      * @param dataPermId 数据权限主键Id。
      * @return 删除成功返回true，否则false。
      */
-    boolean remove(Long dataPermId);
+    boolean remove(String dataPermId);
 
     /**
      * 获取数据权限列表及其关联数据。
@@ -59,7 +59,7 @@ public interface SysDataPermService extends IBaseService<SysDataPerm, Long> {
      * @param userId    用户主键Id。
      * @param deptId    用户所属部门主键Id。
      */
-    void putDataPermCache(String sessionId, Long userId, Long deptId);
+    void putDataPermCache(String sessionId, String userId, String 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, Long deptId);
+    Map<String, Map<Integer, String>> getSysDataPermListByUserId(String userId, String deptId);
 
     /**
      * 查询与指定菜单关联的数据权限列表。
@@ -91,7 +91,7 @@ public interface SysDataPermService extends IBaseService<SysDataPerm, Long> {
      * @param dataPermId 数据权限Id。
      * @param userIdSet  关联的用户Id列表。
      */
-    void addDataPermUserList(Long dataPermId, Set<Long> userIdSet);
+    void addDataPermUserList(String dataPermId, Set<String> userIdSet);
 
     /**
      * 移除用户和数据权限之间的多对多关联关系。

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(Long userId);
+    Collection<String> getPermCodeListByUserId(String userId);
 
     /**
      * 获取所有权限字数据列表，已去重。

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

@@ -53,7 +53,7 @@ public interface SysPermService extends IBaseService<SysPerm, Long> {
      * @param userId     用户主键Id。
      * @param permUrlSet URL集合。
      */
-    void putUserSysPermCache(String sessionId, Long userId, Set<String> permUrlSet);
+    void putUserSysPermCache(String sessionId, String userId, Set<String> permUrlSet);
 
     /**
      * 将指定会话的权限集合从缓存中移除。

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

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

@@ -76,8 +76,8 @@ 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(idGenerator.nextLongId());
+    public SysDataPerm saveNew(SysDataPerm dataPerm, Set<String> deptIdSet, Set<String> menuIdSet) {
+        dataPerm.setDataPermId(idGenerator.nextLongId() + "");
         MyModelUtil.fillCommonsForInsert(dataPerm);
         sysDataPermMapper.insert(dataPerm);
         this.insertRelationData(dataPerm, deptIdSet, menuIdSet);
@@ -87,9 +87,9 @@ public class SysDataPermServiceImpl extends BaseService<SysDataPerm, Long> imple
     @Transactional(rollbackFor = Exception.class)
     @Override
     public boolean update(
-            SysDataPerm dataPerm, SysDataPerm originalDataPerm, Set<Long> deptIdSet, Set<Long> menuIdSet) {
+            SysDataPerm dataPerm, SysDataPerm originalDataPerm, Set<String> deptIdSet, Set<String> menuIdSet) {
         MyModelUtil.fillCommonsForUpdate(dataPerm, originalDataPerm);
-        UpdateWrapper<SysDataPerm> uw = this.createUpdateQueryForNullValue(dataPerm, dataPerm.getDataPermId());
+        UpdateWrapper<SysDataPerm> uw = this.createUpdateQueryForNullValue(dataPerm, Long.valueOf(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(Long dataPermId) {
+    public boolean remove(String 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, Long deptId) {
+    public void putDataPermCache(String sessionId, String userId, String 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, Long deptId) {
+    public Map<String, Map<Integer, String>> getSysDataPermListByUserId(String userId, String deptId) {
         List<SysDataPerm> dataPermList = sysDataPermMapper.getSysDataPermListByUserId(userId);
         dataPermList.forEach(dataPerm -> {
             if (CollUtil.isNotEmpty(dataPerm.getDataPermDeptList())) {
-                Set<Long> deptIdSet = dataPerm.getDataPermDeptList().stream()
+                Set<String> deptIdSet = dataPerm.getDataPermDeptList().stream()
                         .map(SysDataPermDept::getDeptId).collect(Collectors.toSet());
                 dataPerm.setDeptIdListString(StrUtil.join(",", deptIdSet));
             }
@@ -187,7 +187,7 @@ public class SysDataPermServiceImpl extends BaseService<SysDataPerm, Long> imple
     }
 
     private Map<String, Map<Integer, String>> mergeAndOptimizeDataPermRule(
-            Map<String, List<SysDataPerm>> menuIdMap, Long deptId) {
+            Map<String, List<SysDataPerm>> menuIdMap, String deptId) {
         Map<String, Map<Integer, String>> menuResultMap = new HashMap<>(menuIdMap.size());
         // 为了更方便进行后续的合并优化处理，这里再基于菜单Id和规则类型进行分组。ruleMap的key是规则类型。
         for (Map.Entry<String, List<SysDataPerm>> entry : menuIdMap.entrySet()) {
@@ -227,15 +227,15 @@ public class SysDataPermServiceImpl extends BaseService<SysDataPerm, Long> imple
         return menuResultMap;
     }
 
-    private String processMultiDeptAndChildren(Map<Integer, List<SysDataPerm>> ruleMap, Long deptId) {
+    private String processMultiDeptAndChildren(Map<Integer, List<SysDataPerm>> ruleMap, String deptId) {
         List<SysDataPerm> parentDeptList = ruleMap.get(DataPermRuleType.TYPE_MULTI_DEPT_AND_CHILD_DEPT);
         if (parentDeptList == null) {
             return null;
         }
-        Set<Long> deptIdSet = new HashSet<>();
+        Set<String> deptIdSet = new HashSet<>();
         for (SysDataPerm parentDept : parentDeptList) {
             deptIdSet.addAll(StrUtil.split(parentDept.getDeptIdListString(), ',')
-                    .stream().map(Long::valueOf).collect(Collectors.toSet()));
+                    .stream().map(String::valueOf).collect(Collectors.toSet()));
         }
         // 在合并所有的多父部门Id之后，需要判断是否有本部门及子部门的规则。如果有，就继续合并。
         if (ruleMap.containsKey(DataPermRuleType.TYPE_DEPT_AND_CHILD_DEPT)) {
@@ -252,15 +252,15 @@ public class SysDataPermServiceImpl extends BaseService<SysDataPerm, Long> imple
         return StrUtil.join(",", deptIdSet);
     }
 
-    private String processMultiDept(Map<Integer, List<SysDataPerm>> ruleMap, Long deptId) {
+    private String processMultiDept(Map<Integer, List<SysDataPerm>> ruleMap, String deptId) {
         List<SysDataPerm> customDeptList = ruleMap.get(DataPermRuleType.TYPE_CUSTOM_DEPT_LIST);
         if (customDeptList == null) {
             return null;
         }
-        Set<Long> deptIdSet = new HashSet<>();
+        Set<String> deptIdSet = new HashSet<>();
         for (SysDataPerm customDept : customDeptList) {
             deptIdSet.addAll(StrUtil.split(customDept.getDeptIdListString(), ',')
-                    .stream().map(Long::valueOf).collect(Collectors.toSet()));
+                    .stream().map(String::valueOf).collect(Collectors.toSet()));
         }
         if (ruleMap.containsKey(DataPermRuleType.TYPE_DEPT_ONLY)) {
             deptIdSet.add(deptId);
@@ -277,8 +277,8 @@ public class SysDataPermServiceImpl extends BaseService<SysDataPerm, Long> imple
      */
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public void addDataPermUserList(Long dataPermId, Set<Long> userIdSet) {
-        for (Long userId : userIdSet) {
+    public void addDataPermUserList(String dataPermId, Set<String> userIdSet) {
+        for (String userId : userIdSet) {
             SysDataPermUser dataPermUser = new SysDataPermUser();
             dataPermUser.setDataPermId(dataPermId);
             dataPermUser.setUserId(userId);
@@ -296,8 +296,8 @@ public class SysDataPermServiceImpl extends BaseService<SysDataPerm, Long> imple
     @Override
     public boolean removeDataPermUser(Long dataPermId, Long userId) {
         SysDataPermUser dataPermUser = new SysDataPermUser();
-        dataPermUser.setDataPermId(dataPermId);
-        dataPermUser.setUserId(userId);
+        dataPermUser.setDataPermId(dataPermId + "");
+        dataPermUser.setUserId(userId + "");
         return sysDataPermUserMapper.delete(new QueryWrapper<>(dataPermUser)) == 1;
     }
 
@@ -327,9 +327,9 @@ public class SysDataPermServiceImpl extends BaseService<SysDataPerm, Long> imple
         return CallResult.ok(jsonObject);
     }
 
-    private void insertRelationData(SysDataPerm dataPerm, Set<Long> deptIdSet, Set<Long> menuIdSet) {
+    private void insertRelationData(SysDataPerm dataPerm, Set<String> deptIdSet, Set<String> menuIdSet) {
         if (CollUtil.isNotEmpty(deptIdSet)) {
-            for (Long deptId : deptIdSet) {
+            for (String deptId : deptIdSet) {
                 SysDataPermDept dataPermDept = new SysDataPermDept();
                 dataPermDept.setDataPermId(dataPerm.getDataPermId());
                 dataPermDept.setDeptId(deptId);
@@ -337,7 +337,7 @@ public class SysDataPermServiceImpl extends BaseService<SysDataPerm, Long> imple
             }
         }
         if (CollUtil.isNotEmpty(menuIdSet)) {
-            for (Long menuId : menuIdSet) {
+            for (String menuId : menuIdSet) {
                 SysDataPermMenu dataPermMenu = new SysDataPermMenu();
                 dataPermMenu.setDataPermId(dataPerm.getDataPermId());
                 dataPermMenu.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(Long userId) {
+    public Collection<String> getPermCodeListByUserId(String userId) {
         List<String> permCodeList = sysPermCodeMapper.getPermCodeListByUserId(userId);
         return new HashSet<>(permCodeList);
     }

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

@@ -130,7 +130,7 @@ public class SysPermServiceImpl extends BaseService<SysPerm, Long> implements Sy
     }
 
     @Override
-    public void putUserSysPermCache(String sessionId, Long userId, Set<String> permUrlSet) {
+    public void putUserSysPermCache(String sessionId, String userId, Set<String> permUrlSet) {
         if (CollUtil.isEmpty(permUrlSet)) {
             return;
         }

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

@@ -64,12 +64,12 @@ public class SysRoleServiceImpl extends BaseService<SysRole, Long> implements Sy
      */
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public SysRole saveNew(SysRole role, Set<Long> menuIdSet) {
-        role.setRoleId(idGenerator.nextLongId());
+    public SysRole saveNew(SysRole role, Set<String> menuIdSet) {
+        role.setRoleId(idGenerator.nextLongId() + "");
         MyModelUtil.fillCommonsForInsert(role);
         sysRoleMapper.insert(role);
         if (menuIdSet != null) {
-            for (Long menuId : menuIdSet) {
+            for (String menuId : menuIdSet) {
                 SysRoleMenu roleMenu = new SysRoleMenu();
                 roleMenu.setRoleId(role.getRoleId());
                 roleMenu.setMenuId(menuId);
@@ -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<Long> menuIdSet) {
+    public boolean update(SysRole role, SysRole originalRole, Set<String> 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 (Long menuId : menuIdSet) {
+            for (String 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(Long roleId) {
+    public boolean remove(String 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(Long userId) {
+    public List<SysUserRole> getSysUserRoleListByUserId(String 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(Long roleId, Long userId) {
+    public boolean removeUserRole(String roleId, String userId) {
         SysUserRole userRole = new SysUserRole();
         userRole.setRoleId(roleId);
         userRole.setUserId(userId);

common/common-flow/src/main/java/com/ankaibei/workFlow/common/flow/service/impl/FlowApiServiceImpl.java

@@ -296,12 +296,12 @@ public class FlowApiServiceImpl implements FlowApiService {
             switch (type) {
                 case FlowConstant.GROUP_TYPE_UP_DEPT_POST_LEADER_VAR:
                     Object upLeaderDeptPostId =
-                            flowIdentityExtHelper.getUpLeaderDeptPostId(Long.valueOf(tokenData.getDeptId()));
+                            flowIdentityExtHelper.getUpLeaderDeptPostId(tokenData.getDeptId());
                     entry.setValue(upLeaderDeptPostId);
                     break;
                 case FlowConstant.GROUP_TYPE_DEPT_POST_LEADER_VAR:
                     Object leaderDeptPostId =
-                            flowIdentityExtHelper.getLeaderDeptPostId(Long.valueOf(tokenData.getDeptId()));
+                            flowIdentityExtHelper.getLeaderDeptPostId(tokenData.getDeptId());
                     entry.setValue(leaderDeptPostId);
                     break;
                 case FlowConstant.GROUP_TYPE_SELF_DEPT_POST_VAR:
@@ -390,7 +390,7 @@ public class FlowApiServiceImpl implements FlowApiService {
         BaseFlowIdentityExtHelper flowIdentityExtHelper = flowCustomExtFactory.getFlowIdentityExtHelper();
         if (hasUpDeptPostLeader) {
             Assert.notNull(flowIdentityExtHelper);
-            Object upLeaderDeptPostId = flowIdentityExtHelper.getUpLeaderDeptPostId(Long.valueOf(tokenData.getDeptId()));
+            Object upLeaderDeptPostId = flowIdentityExtHelper.getUpLeaderDeptPostId(tokenData.getDeptId());
             if (upLeaderDeptPostId == null) {
                 variableMap.put(FlowConstant.GROUP_TYPE_UP_DEPT_POST_LEADER_VAR, null);
             } else {
@@ -399,7 +399,7 @@ public class FlowApiServiceImpl implements FlowApiService {
         }
         if (hasDeptPostLeader) {
             Assert.notNull(flowIdentityExtHelper);
-            Object leaderDeptPostId = flowIdentityExtHelper.getLeaderDeptPostId(Long.valueOf(tokenData.getDeptId()));
+            Object leaderDeptPostId = flowIdentityExtHelper.getLeaderDeptPostId(tokenData.getDeptId());
             if (leaderDeptPostId == null) {
                 variableMap.put(FlowConstant.GROUP_TYPE_DEPT_POST_LEADER_VAR, null);
             } else {

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