ID统一用字符串

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 Long id;
+   private String id;
 
     // 用户名
     private String username;
@@ -40,8 +40,8 @@ public class SysUser {
     //"头像地址"
     private String headUrl;
 
- //"公司id"
- private Long deptId;
+    //"公司id"
+    private String deptId;
 
     // 描述
     private String description;

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

@@ -239,7 +239,7 @@ public class SysDeptController {
         //String orderBy = MyOrderParam.buildOrderBy(orderParam, SysPost.class);
         List<SysPost> sysPostList;
         if (MyCommonUtil.isNotBlankOrNull(deptId)) {
-            sysPostList = sysPostService.getNotInSysPostListByDeptId(deptId, filter);
+            sysPostList = sysPostService.getNotInSysPostListByDeptId(deptId + "", filter);
         } else {
             sysPostList = sysPostService.getSysPostList(filter);
             sysPostService.buildRelationForDataList(sysPostList, MyRelationParam.dictOnly());
@@ -292,7 +292,7 @@ public class SysDeptController {
         if (errorMessage != null) {
             return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
         }
-        Set<Long> postIdSet = sysDeptPostDtoList.stream().map(SysDeptPostDto::getPostId).collect(Collectors.toSet());
+        Set<String> 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);
         }
@@ -332,7 +332,7 @@ public class SysDeptController {
         if (MyCommonUtil.existBlankArgument(deptId, postId)) {
             return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
         }
-        SysDeptPost sysDeptPost = sysDeptService.getSysDeptPost(deptId, postId);
+        SysDeptPost sysDeptPost = sysDeptService.getSysDeptPost(deptId + "", postId + "");
         if (sysDeptPost == null) {
             return ResponseResult.error(ErrorCodeEnum.DATA_NOT_EXIST);
         }
@@ -352,7 +352,7 @@ public class SysDeptController {
         if (MyCommonUtil.existBlankArgument(deptId, postId)) {
             return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
         }
-        if (!sysDeptService.removeSysDeptPost(deptId, postId)) {
+        if (!sysDeptService.removeSysDeptPost(deptId + "", postId + "")) {
             return ResponseResult.error(ErrorCodeEnum.DATA_NOT_EXIST);
         }
         return ResponseResult.success();

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

@@ -87,9 +87,12 @@ public class SysUserController {
         if (!result.isSuccess()) {
             return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, result.getErrorMessage());
         }
-        Set<Long> deptPostIdSet = result.getData().getObject("deptPostIdSet", new TypeReference<Set<Long>>() {});
-        Set<Long> roleIdSet = result.getData().getObject("roleIdSet", new TypeReference<Set<Long>>() {});
-        Set<Long> dataPermIdSet = result.getData().getObject("dataPermIdSet", new TypeReference<Set<Long>>() {});
+        Set<String> deptPostIdSet = result.getData().getObject("deptPostIdSet", new TypeReference<Set<Long>>() {
+        });
+        Set<String> roleIdSet = result.getData().getObject("roleIdSet", new TypeReference<Set<Long>>() {
+        });
+        Set<String> dataPermIdSet = result.getData().getObject("dataPermIdSet", new TypeReference<Set<Long>>() {
+        });
         sysUser.setUserType(1);
         sysUserService.saveNew(sysUser, roleIdSet, deptPostIdSet, dataPermIdSet);
         return ResponseResult.success(sysUser.getUserId());
@@ -172,7 +175,7 @@ public class SysUserController {
         if (MyCommonUtil.existBlankArgument(userId)) {
             return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
         }
-        return this.doDelete(userId);
+        return this.doDelete(userId + "");
     }
 
     /**
@@ -352,7 +355,7 @@ public class SysUserController {
         return ResponseResult.success(sysUserService.getSysMenuListWithDetail(userId, menuName));
     }
 
-    private ResponseResult<Void> doDelete(Long userId) {
+    private ResponseResult<Void> doDelete(String userId) {
         String errorMessage;
         // 验证关联Id的数据合法性
         SysUser originalSysUser = sysUserService.getById(userId);
@@ -361,7 +364,7 @@ public class SysUserController {
             errorMessage = "数据验证失败，当前 [对象] 并不存在，请刷新后重试！";
             return ResponseResult.error(ErrorCodeEnum.DATA_NOT_EXIST, errorMessage);
         }
-        if (!sysUserService.remove(userId + "")) {
+        if (!sysUserService.remove(userId)) {
             errorMessage = "数据操作失败，删除的对象不存在，请刷新后重试！";
             return ResponseResult.error(ErrorCodeEnum.DATA_NOT_EXIST, errorMessage);
         }

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

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

@@ -44,6 +44,6 @@ public interface SysPostMapper extends BaseDaoMapper<SysPost> {
      * @return 与主表没有建立关联的从表数据列表。
      */
     List<SysPost> getNotInSysPostListByDeptId(
-            @Param("deptId") Long deptId,
+            @Param("deptId") String deptId,
             @Param("sysPostFilter") SysPost sysPostFilter);
 }

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

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 Long dataPermId;
+    private String 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 Long dataPermId;
+    private String dataPermId;
 
     /**
      * 关联部门Id。
      */
     @TableField(value = "dept_id")
-    private Long deptId;
+    private String 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 Long dataPermId;
+    private String dataPermId;
 
     /**
      * 关联菜单Id。
      */
     @TableField(value = "menu_id")
-    private Long menuId;
+    private String 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 Long dataPermId;
+    private String dataPermId;
 
     /**
      * 用户Id。
      */
     @TableField(value = "user_id")
-    private Long userId;
+    private String 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 Long deptId;
+    private String deptId;
 
     /**
      * 部门名称。
@@ -44,7 +44,7 @@ public class SysDept {
      * 父部门Id。
      */
     @TableField(value = "parent_id")
-    private Long parentId;
+    private String parentId;
     /**
      * 逻辑删除标记字段(1: 正常 -1: 已删除)。
      */

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

@@ -17,7 +17,7 @@ public class SysDeptPost {
      * 部门岗位Id。
      */
     @TableId(value = "dept_post_id")
-    private Long deptPostId;
+    private String deptPostId;
 
     /**
      * 部门岗位Id。
@@ -29,13 +29,13 @@ public class SysDeptPost {
      * 部门Id。
      */
     @TableField(value = "dept_id")
-    private Long deptId;
+    private String deptId;
 
     /**
      * 岗位Id。
      */
     @TableField(value = "post_id")
-    private Long postId;
+    private String 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 Long parentDeptId;
+    private String parentDeptId;
 
     /**
      * 部门Id。
      */
     @TableField(value = "dept_id")
-    private Long deptId;
+    private String deptId;
 }

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 Long roleId;
+    private String 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 Long roleId;
+    private String roleId;
 
     /**
      * 菜单Id。
      */
     @TableField(value = "menu_id")
-    private Long menuId;
+    private String 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 Long userId;
+    private String userId;
 
     /**
      * 登录用户名。
@@ -52,7 +52,7 @@ public class SysUser {
      * 用户部门Id。
      */
     @TableField(value = "dept_id")
-    private Long deptId;
+    private String 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 Long userId;
+    private String userId;
 
     /**
      * 部门岗位Id。
      */
     @TableField(value = "dept_post_id")
-    private Long deptPostId;
+    private String deptPostId;
 
     /**
      * 岗位Id。
      */
     @TableField(value = "post_id")
-    private Long postId;
+    private String 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 Long userId;
+    private String userId;
 
     /**
      * 角色Id。
      */
     @TableField(value = "role_id")
-    private Long roleId;
+    private String roleId;
 }

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

@@ -114,7 +114,7 @@ public interface SysDeptService extends IBaseService<SysDept, Long> {
      * @param deptPostId 部门岗位Id。
      * @return 部门岗位对象。
      */
-    SysDeptPost getSysDeptPost(Long deptPostId);
+    SysDeptPost getSysDeptPost(String deptPostId);
 
     /**
      * 获取指定部门Id的部门岗位多对多关联数据列表，以及关联的部门和岗位数据。

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

@@ -43,11 +43,10 @@ public interface SysPostService extends IBaseService<SysPost, Long> {
      * 获取单表查询结果。由于没有关联数据查询，因此在仅仅获取单表数据的场景下，效率更高。
      * 如果需要同时获取关联数据，请移步(getSysPostListWithRelation)方法。
      *
-     * @param filter  过滤对象。
-     * @param orderBy 排序参数。
+     * @param filter 过滤对象。
      * @return 查询结果集。
      */
-    List<SysPost> getSysPostList(SysPost filter, String orderBy);
+    List<SysPost> getSysPostList(SysPost filter);
 
     /**
      * 获取主表的查询结果，以及主表关联的字典数据和一对一从表数据，以及一对一从表的字典数据。
@@ -58,17 +57,16 @@ public interface SysPostService extends IBaseService<SysPost, Long> {
      * @param orderBy 排序参数。
      * @return 查询结果集。
      */
-    List<SysPost> getSysPostListWithRelation(SysPost filter, String orderBy);
+    List<SysPost> getSysPostListWithRelation(SysPost filter);
 
     /**
      * 在多对多关系中，当前Service的数据表为从表，返回不与指定主表主键Id存在对多对关系的列表。
      *
      * @param deptId  主表主键Id。
      * @param filter  从表的过滤对象。
-     * @param orderBy 排序参数。
      * @return 查询结果集。
      */
-    List<SysPost> getNotInSysPostListByDeptId(Long deptId, SysPost filter, String orderBy);
+    List<SysPost> getNotInSysPostListByDeptId(String deptId, SysPost filter);
 
     /**
      * 获取指定部门的岗位列表。

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

@@ -33,7 +33,7 @@ public interface SysUserService extends IBaseService<SysUser, String> {
      * @param dataPermIdSet 数据权限Id集合。
      * @return 新增后的用户对象。
      */
-    SysUser saveNew(SysUser user, Set<Long> roleIdSet, Set<Long> deptPostIdSet, Set<Long> dataPermIdSet);
+    SysUser saveNew(SysUser user, Set<String> roleIdSet, Set<String> deptPostIdSet, Set<String> dataPermIdSet);
 
     /**
      * 更新用户对象。
@@ -71,7 +71,7 @@ public interface SysUserService extends IBaseService<SysUser, String> {
      * @param userId 主键Id。
      * @return 成功返回true，否则false。
      */
-    boolean remove(Long userId);
+    boolean remove(String userId);
 
     /**
      * 获取单表查询结果。由于没有关联数据查询，因此在仅仅获取单表数据的场景下，效率更高。
@@ -209,7 +209,7 @@ public interface SysUserService extends IBaseService<SysUser, String> {
      * @param deptId 部门id
      * @return
      */
-    List<SysUser> getSysUsersByDeptId(Long deptId);
+    List<SysUser> getSysUsersByDeptId(String deptId);
 
     /**
      * 查询填写的邮箱、号码、工号是否已存在
@@ -230,6 +230,6 @@ public interface SysUserService extends IBaseService<SysUser, String> {
      * @param userId    用户Id。
      * @return
      */
-    String verifyContactDataOfTheir(String email, String mobile, String jobNumber, Long userId);
+    String verifyContactDataOfTheir(String email, String mobile, String jobNumber, String userId);
 
 }

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

@@ -295,7 +295,7 @@ public class SysDeptServiceImpl extends BaseService<SysDept, Long> implements Sy
     }
 
     @Override
-    public SysDeptPost getSysDeptPost(Long deptPostId) {
+    public SysDeptPost getSysDeptPost(String deptPostId) {
         return sysDeptPostMapper.selectById(deptPostId);
     }
 

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

@@ -140,12 +140,12 @@ public class SysPostServiceImpl extends BaseService<SysPost, Long> implements Sy
     /**
      * 在多对多关系中，当前Service的数据表为从表，返回不与指定主表主键Id存在对多对关系的列表。
      *
-     * @param deptId  主表主键Id。
-     * @param filter  从表的过滤对象。
+     * @param deptId 主表主键Id。
+     * @param filter 从表的过滤对象。
      * @return 查询结果集。
      */
     @Override
-    public List<SysPost> getNotInSysPostListByDeptId(Long deptId, SysPost filter) {
+    public List<SysPost> getNotInSysPostListByDeptId(String deptId, SysPost filter) {
         List<SysPost> resultList = sysPostMapper.getNotInSysPostListByDeptId(deptId, filter);
         this.buildRelationForDataList(resultList, MyRelationParam.dictOnly());
         return resultList;

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

@@ -93,15 +93,15 @@ 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(idGenerator.nextLongId());
+    public SysUser saveNew(SysUser user, Set<String> roleIdSet, Set<String> deptPostIdSet, Set<String> dataPermIdSet) {
+        user.setUserId(idGenerator.nextLongId() + "");
         user.setPassword(passwordEncoder.encode(user.getPassword()));
         user.setUserStatus(SysUserStatus.STATUS_NORMAL);
         user.setDeletedFlag(GlobalDeletedFlag.NORMAL);
         MyModelUtil.fillCommonsForInsert(user);
         sysUserMapper.insert(user);
         if (CollUtil.isNotEmpty(deptPostIdSet)) {
-            for (Long deptPostId : deptPostIdSet) {
+            for (String deptPostId : deptPostIdSet) {
                 SysDeptPost deptPost = sysDeptService.getSysDeptPost(deptPostId);
                 SysUserPost userPost = new SysUserPost();
                 userPost.setUserId(user.getUserId());
@@ -111,7 +111,7 @@ public class SysUserServiceImpl extends BaseService<SysUser, String> implements
             }
         }
         if (CollUtil.isNotEmpty(roleIdSet)) {
-            for (Long roleId : roleIdSet) {
+            for (String roleId : roleIdSet) {
                 SysUserRole userRole = new SysUserRole();
                 userRole.setUserId(user.getUserId());
                 userRole.setRoleId(roleId);
@@ -119,7 +119,7 @@ public class SysUserServiceImpl extends BaseService<SysUser, String> implements
             }
         }
         if (CollUtil.isNotEmpty(dataPermIdSet)) {
-            for (Long dataPermId : dataPermIdSet) {
+            for (String dataPermId : dataPermIdSet) {
                 SysDataPermUser dataPermUser = new SysDataPermUser();
                 dataPermUser.setDataPermId(dataPermId);
                 dataPermUser.setUserId(user.getUserId());
@@ -145,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, String.valueOf(user.getUserId()));
+        UpdateWrapper<SysUser> uw = this.createUpdateQueryForNullValue(user, user.getUserId());
         if (sysUserMapper.update(user, uw) != 1) {
             return false;
         }
@@ -155,10 +155,10 @@ public class SysUserServiceImpl extends BaseService<SysUser, String> implements
         sysUserPostMapper.delete(new QueryWrapper<>(deletedUserPost));
         if (CollUtil.isNotEmpty(deptPostIdSet)) {
             for (Long deptPostId : deptPostIdSet) {
-                SysDeptPost deptPost = sysDeptService.getSysDeptPost(deptPostId);
+                SysDeptPost deptPost = sysDeptService.getSysDeptPost(deptPostId + "");
                 SysUserPost userPost = new SysUserPost();
                 userPost.setUserId(user.getUserId());
-                userPost.setDeptPostId(deptPostId);
+                userPost.setDeptPostId(deptPostId + "");
                 userPost.setPostId(deptPost.getPostId());
                 sysUserPostMapper.insert(userPost);
             }
@@ -171,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(roleId);
+                userRole.setRoleId(roleId + "");
                 sysUserRoleMapper.insert(userRole);
             }
         }
@@ -182,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(dataPermId);
+                dataPermUser.setDataPermId(dataPermId + "");
                 dataPermUser.setUserId(user.getUserId());
                 sysDataPermUserMapper.insert(dataPermUser);
             }
@@ -223,7 +223,7 @@ public class SysUserServiceImpl extends BaseService<SysUser, String> implements
      */
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public boolean remove(Long userId) {
+    public boolean remove(String userId) {
         if (sysUserMapper.deleteById(userId) == 0) {
             return false;
         }
@@ -433,7 +433,7 @@ public class SysUserServiceImpl extends BaseService<SysUser, String> implements
     }
 
     @Override
-    public List<SysUser> getSysUsersByDeptId(Long deptId) {
+    public List<SysUser> getSysUsersByDeptId(String deptId) {
         List<SysUser> userList = sysUserMapper.getSysUsersByDeptId(deptId);
         return userList;
     }
@@ -453,7 +453,7 @@ public class SysUserServiceImpl extends BaseService<SysUser, String> implements
     }
 
     @Override
-    public String verifyContactDataOfTheir(String email, String mobile, String jobNumber, Long userId) {
+    public String verifyContactDataOfTheir(String email, String mobile, String jobNumber, String userId) {
         if (sysUserMapper.getSysUsersByEmailOfTheir(email, userId).size() > 0) {
             return "该邮箱已被使用，请确认邮箱无误！";
         }

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

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

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(tokenData.getDeptId());
+                            flowIdentityExtHelper.getUpLeaderDeptPostId(Long.valueOf(tokenData.getDeptId()));
                     entry.setValue(upLeaderDeptPostId);
                     break;
                 case FlowConstant.GROUP_TYPE_DEPT_POST_LEADER_VAR:
                     Object leaderDeptPostId =
-                            flowIdentityExtHelper.getLeaderDeptPostId(tokenData.getDeptId());
+                            flowIdentityExtHelper.getLeaderDeptPostId(Long.valueOf(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(tokenData.getDeptId());
+            Object upLeaderDeptPostId = flowIdentityExtHelper.getUpLeaderDeptPostId(Long.valueOf(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(tokenData.getDeptId());
+            Object leaderDeptPostId = flowIdentityExtHelper.getLeaderDeptPostId(Long.valueOf(tokenData.getDeptId()));
             if (leaderDeptPostId == null) {
                 variableMap.put(FlowConstant.GROUP_TYPE_DEPT_POST_LEADER_VAR, null);
             } else {