实体类对应的mapper生成，和主键集合对应的主键字段类型统一

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

@@ -393,15 +393,15 @@ public class CostInfoController {
         //---从所有的任务里取出一个分类的任务
         //先拿到任务所在的全部流程
         List<FlowTaskVo> flowTaskVoListByQueryType = new ArrayList<>();
-        Set<Long> entryIdList = new HashSet<>();
+        Set<String> entryIdList = new HashSet<>();
         for (FlowTaskVo taskVo : flowTaskVoList) {
-            entryIdList.add(Long.valueOf(taskVo.getEntryId()));
+            entryIdList.add(taskVo.getEntryId());
         }
         List<FlowEntry> entryList = flowEntryService.getInList(entryIdList);
         //获取流程所在的分类
-        Set<Long> categoryIdList = new HashSet<>();
+        Set<String> categoryIdList = new HashSet<>();
         for (FlowEntry entry : entryList) {
-            categoryIdList.add(Long.valueOf(entry.getCategoryId()));
+            categoryIdList.add(entry.getCategoryId());
         }
         List<FlowCategory> flowCategoryList = categoryService.getInList(categoryIdList);
         //给流程任务对象的流程分类字段赋值

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

@@ -189,7 +189,7 @@ public class SysDataPermController {
      * @return 应答结果对象，包含数据权限的详情。
      */
     @GetMapping("/view")
-    public ResponseResult<SysDataPermVo> view(@RequestParam Long dataPermId) {
+    public ResponseResult<SysDataPermVo> view(@RequestParam String dataPermId) {
         if (MyCommonUtil.existBlankArgument(dataPermId)) {
             return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
         }
@@ -213,7 +213,7 @@ public class SysDataPermController {
      */
     @PostMapping("/listNotInDataPermUser")
     public ResponseResult<MyPageData<SysUserVo>> listNotInDataPermUser(
-            @MyRequestBody Long dataPermId,
+            @MyRequestBody String dataPermId,
             @MyRequestBody SysUserDto sysUserDtoFilter,
             @MyRequestBody MyOrderParam orderParam,
             @MyRequestBody MyPageParam pageParam) {
@@ -242,7 +242,7 @@ public class SysDataPermController {
      */
     @PostMapping("/listDataPermUser")
     public ResponseResult<MyPageData<SysUserVo>> listDataPermUser(
-            @MyRequestBody Long dataPermId,
+            @MyRequestBody String dataPermId,
             @MyRequestBody SysUserDto sysUserDtoFilter,
             @MyRequestBody MyOrderParam orderParam,
             @MyRequestBody MyPageParam pageParam) {
@@ -260,7 +260,7 @@ public class SysDataPermController {
         return ResponseResult.success(MyPageUtil.makeResponseData(userList, SysUser.INSTANCE));
     }
 
-    private ResponseResult<Void> doDataPermUserVerify(Long dataPermId) {
+    private ResponseResult<Void> doDataPermUserVerify(String dataPermId) {
         if (MyCommonUtil.existBlankArgument(dataPermId)) {
             return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
         }
@@ -280,13 +280,13 @@ public class SysDataPermController {
     @OperationLog(type = SysOperationLogType.ADD_M2M)
     @PostMapping("/addDataPermUser")
     public ResponseResult<Void> addDataPermUser(
-            @MyRequestBody Long dataPermId, @MyRequestBody String userIdListString) {
+            @MyRequestBody String 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());
-        if (!sysDataPermService.existId(Long.valueOf(dataPermId))
+        if (!sysDataPermService.existId(dataPermId)
                 || !sysUserService.existUniqueKeyList("userId", userIdSet)) {
             return ResponseResult.error(ErrorCodeEnum.INVALID_RELATED_RECORD_ID);
         }

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

@@ -6,6 +6,7 @@ import cn.hutool.core.util.ObjectUtil;
 import com.ankaibei.workFlow.common.log.annotation.OperationLog;
 import com.ankaibei.workFlow.common.log.model.constant.SysOperationLogType;
 import com.ankaibei.workFlow.webadmin.ankaibei.entity.UserInfoEntity;
+import com.ankaibei.workFlow.webadmin.upms.dao.SysDeptMapper;
 import com.github.pagehelper.page.PageMethod;
 import com.ankaibei.workFlow.webadmin.upms.vo.*;
 import com.ankaibei.workFlow.webadmin.upms.dto.*;
@@ -36,7 +37,8 @@ import java.util.stream.Collectors;
 @RestController
 @RequestMapping("/admin/upms/sysDept")
 public class SysDeptController {
-
+    @Autowired
+    private SysDeptMapper sysDeptMapper;
     @Resource
     private SysDeptService sysDeptService;
     @Resource
@@ -202,7 +204,7 @@ public class SysDeptController {
      * @return 应答结果对象，包含对象详情。
      */
     @GetMapping("/view")
-    public ResponseResult<SysDeptVo> view(@RequestParam Long deptId) {
+    public ResponseResult<SysDeptVo> view(@RequestParam String deptId) {
         if (MyCommonUtil.existBlankArgument(deptId)) {
             return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
         }
@@ -225,7 +227,7 @@ public class SysDeptController {
      */
     @PostMapping("/listNotInSysDeptPost")
     public ResponseResult<MyPageData<SysPostVo>> listNotInSysDeptPost(
-            @MyRequestBody Long deptId,
+            @MyRequestBody String deptId,
             @MyRequestBody SysPostDto sysPostDtoFilter,
             @MyRequestBody MyOrderParam orderParam,
             @MyRequestBody MyPageParam pageParam) {
@@ -286,7 +288,7 @@ public class SysDeptController {
             return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
         }
         Set<String> postIdSet = sysDeptPostDtoList.stream().map(SysDeptPostDto::getPostId).collect(Collectors.toSet());
-        if (!sysDeptService.existId(Long.valueOf(deptId)) || !sysPostService.existUniqueKeyList("postId", postIdSet)) {
+        if (!sysDeptService.existId(deptId) || !sysPostService.existUniqueKeyList("postId", postIdSet)) {
             return ResponseResult.error(ErrorCodeEnum.INVALID_RELATED_RECORD_ID);
         }
         List<SysDeptPost> sysDeptPostList = MyModelUtil.copyCollectionTo(sysDeptPostDtoList, SysDeptPost.class);
@@ -384,7 +386,7 @@ public class SysDeptController {
      * @return 应答结果对象，包含字典形式的数据集合。
      */
     @PostMapping("/listDictByIds")
-    public ResponseResult<List<Map<String, String>>> listDictByIds(@MyRequestBody List<Long> dictIds) {
+    public ResponseResult<List<Map<String, String>>> listDictByIds(@MyRequestBody List<String> dictIds) {
         List<SysDept> resultList = sysDeptService.getInList(new HashSet<>(dictIds));
         List<Map<String, Object>> mapList = BeanQuery.select("parentId as parentId", "deptId as id", "deptName as name").executeFrom(resultList);
         return ResponseResult.success(sysDeptService.lossOfAccuracy(mapList));
@@ -398,7 +400,7 @@ public class SysDeptController {
      * @return 按照字典的形式返回下级数据列表。
      */
     @GetMapping("/listDictByParentId")
-    public ResponseResult<List<Map<String, String>>> listDictByParentId(@RequestParam(required = false) Long parentId) {
+    public ResponseResult<List<Map<String, String>>> listDictByParentId(@RequestParam(required = false) String parentId) {
         List<SysDept> resultList = sysDeptService.getListByParentId("parentId", parentId);
         List<Map<String, Object>> mapList = BeanQuery.select("parentId as parentId", "deptId as id", "deptName as name").executeFrom(resultList);
         return ResponseResult.success(sysDeptService.lossOfAccuracy(mapList));

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

@@ -195,7 +195,7 @@ public class SysMenuController {
      * @return 应答结果对象，包含菜单详情。
      */
     @GetMapping("/view")
-    public ResponseResult<SysMenuVo> view(@RequestParam Long menuId) {
+    public ResponseResult<SysMenuVo> view(@RequestParam String menuId) {
         if (MyCommonUtil.existBlankArgument(menuId)) {
             return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
         }

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

@@ -152,7 +152,7 @@ public class SysPermCodeController {
      * @return 应答结果对象，包含权限字对象详情。
      */
     @GetMapping("/view")
-    public ResponseResult<SysPermCodeVo> view(@RequestParam Long permCodeId) {
+    public ResponseResult<SysPermCodeVo> view(@RequestParam String permCodeId) {
         if (MyCommonUtil.existBlankArgument(permCodeId)) {
             return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
         }

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

@@ -142,7 +142,7 @@ public class SysPostController {
         if (MyCommonUtil.existBlankArgument(postId)) {
             return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
         }
-        SysPost sysPost = sysPostService.getByIdWithRelation(postId, MyRelationParam.full());
+        SysPost sysPost = sysPostService.getByIdWithRelation(postId + "", MyRelationParam.full());
         if (sysPost == null) {
             return ResponseResult.error(ErrorCodeEnum.DATA_NOT_EXIST);
         }
@@ -172,7 +172,7 @@ public class SysPostController {
      * @return 应答结果对象，包含字典形式的数据集合。
      */
     @PostMapping("/listDictByIds")
-    public ResponseResult<List<Map<String, String>>> listDictByIds(@RequestBody List<Long> postIds) {
+    public ResponseResult<List<Map<String, String>>> listDictByIds(@RequestBody List<String> postIds) {
         List<SysPost> resultList = sysPostService.getInList(new HashSet<>(postIds));
         List<Map<String, Object>> mapList = BeanQuery.select("postId as id", "postName as name").executeFrom(resultList);
         return ResponseResult.success(sysDeptService.lossOfAccuracy(mapList));

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

@@ -172,7 +172,7 @@ public class SysRoleController {
         if (MyCommonUtil.existBlankArgument(roleId)) {
             return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
         }
-        SysRole sysRole = sysRoleService.getByIdWithRelation(roleId, MyRelationParam.full());
+        SysRole sysRole = sysRoleService.getByIdWithRelation(roleId + "", MyRelationParam.full());
         if (sysRole == null) {
             return ResponseResult.error(ErrorCodeEnum.DATA_NOT_EXIST);
         }
@@ -241,7 +241,7 @@ public class SysRoleController {
         if (MyCommonUtil.existBlankArgument(roleId)) {
             return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
         }
-        if (!sysRoleService.existId(roleId)) {
+        if (!sysRoleService.existId(roleId + "")) {
             return ResponseResult.error(ErrorCodeEnum.INVALID_RELATED_RECORD_ID);
         }
         return ResponseResult.success();
@@ -263,7 +263,7 @@ public class SysRoleController {
         }
         Set<Long> userIdSet = Arrays.stream(
                 userIdListString.split(",")).map(Long::valueOf).collect(Collectors.toSet());
-        if (!sysRoleService.existId(Long.valueOf(roleId))
+        if (!sysRoleService.existId(roleId + "")
                 || !sysUserService.existUniqueKeyList("userId", userIdSet)) {
             return ResponseResult.error(ErrorCodeEnum.INVALID_RELATED_RECORD_ID);
         }
@@ -319,7 +319,7 @@ public class SysRoleController {
      * @return 应答结果对象，包含字典形式的数据集合。
      */
     @PostMapping("/listDictByIds")
-    public ResponseResult<List<Map<String, Object>>> listDictByIds(@MyRequestBody List<Long> dictIds) {
+    public ResponseResult<List<Map<String, Object>>> listDictByIds(@MyRequestBody List<String> dictIds) {
         List<SysRole> resultList = sysRoleService.getInList(new HashSet<>(dictIds));
         return ResponseResult.success(BeanQuery.select(
                 "roleId as id", "roleName as name").executeFrom(resultList));

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

@@ -32,7 +32,7 @@ public interface SysPostMapper extends BaseDaoMapper<SysPost> {
      * @return 岗位数据列表。
      */
     List<SysPost> getSysPostListByDeptId(
-            @Param("deptId") Long deptId,
+            @Param("deptId") String deptId,
             @Param("sysPostFilter") SysPost sysPostFilter,
             @Param("orderBy") String orderBy);
 

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

@@ -66,7 +66,7 @@ public interface SysUserMapper extends BaseDaoMapper<SysUser> {
      * @return 和DataPermId关联的用户列表。
      */
     List<SysUser> getSysUserListByDataPermId(
-            @Param("dataPermId") Long dataPermId,
+            @Param("dataPermId") String dataPermId,
             @Param("sysUserFilter") SysUser sysUserFilter,
             @Param("orderBy") String orderBy);
 
@@ -79,7 +79,7 @@ public interface SysUserMapper extends BaseDaoMapper<SysUser> {
      * @return 和DataPermId没有建立关联关系的用户列表。
      */
     List<SysUser> getNotInSysUserListByDataPermId(
-            @Param("dataPermId") Long dataPermId,
+            @Param("dataPermId") String dataPermId,
             @Param("sysUserFilter") SysUser sysUserFilter,
             @Param("orderBy") String orderBy);
 

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

@@ -22,7 +22,7 @@ public class SysPostDto extends MyPageParam {
     /**
      * 岗位Id。
      */
-    private Long deptId;
+    private String deptId;
 
 
     /**

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

@@ -12,7 +12,7 @@ import java.util.*;
  * @author Buzhanyi
  * @date 2022-09-25
  */
-public interface SysDataPermService extends IBaseService<SysDataPerm, Long> {
+public interface SysDataPermService extends IBaseService<SysDataPerm, String> {
 
     /**
      * 保存新增的数据权限对象。

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

@@ -11,7 +11,7 @@ import java.util.*;
  * @author Buzhanyi
  * @date 2022-09-25
  */
-public interface SysDeptService extends IBaseService<SysDept, Long> {
+public interface SysDeptService extends IBaseService<SysDept, String> {
 
     /**
      * 保存新增的部门对象。

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

@@ -12,7 +12,7 @@ import java.util.*;
  * @author Buzhanyi
  * @date 2022-09-25
  */
-public interface SysMenuService extends IBaseService<SysMenu, Long> {
+public interface SysMenuService extends IBaseService<SysMenu, String> {
 
     /**
      * 保存新增的菜单对象。

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

@@ -12,7 +12,7 @@ import java.util.*;
  * @author Buzhanyi
  * @date 2022-09-25
  */
-public interface SysPermCodeService extends IBaseService<SysPermCode, Long> {
+public interface SysPermCodeService extends IBaseService<SysPermCode, String> {
 
     /**
      * 获取指定用户的权限字列表，已去重。

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

@@ -11,7 +11,7 @@ import java.util.*;
  * @author Buzhanyi
  * @date 2022-09-25
  */
-public interface SysPermModuleService extends IBaseService<SysPermModule, Long> {
+public interface SysPermModuleService extends IBaseService<SysPermModule, String> {
 
     /**
      * 保存新增的权限资源模块对象。

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

@@ -1,99 +0,0 @@
-package com.ankaibei.workFlow.webadmin.upms.service;
-
-import com.ankaibei.workFlow.common.core.base.service.IBaseService;
-import com.ankaibei.workFlow.webadmin.upms.model.SysPerm;
-
-import java.util.*;
-
-/**
- * 权限资源数据服务接口。
- *
- * @author Buzhanyi
- * @date 2022-09-25
- */
-public interface SysPermService extends IBaseService<SysPerm, Long> {
-
-    /**
-     * 保存新增的权限资源对象。
-     *
-     * @param perm 新增的权限资源对象。
-     * @return 新增后的权限资源对象。
-     */
-    SysPerm saveNew(SysPerm perm);
-
-    /**
-     * 更新权限资源对象。
-     *
-     * @param perm         更新的权限资源对象。
-     * @param originalPerm 原有的权限资源对象。
-     * @return 更新成功返回true，否则false。
-     */
-    boolean update(SysPerm perm, SysPerm originalPerm);
-
-    /**
-     * 删除权限资源。
-     *
-     * @param permId 权限资源主键Id。
-     * @return 删除成功返回true，否则false。
-     */
-    boolean remove(String permId);
-
-    /**
-     * 获取权限数据列表。
-     *
-     * @param sysPermFilter 过滤对象。
-     * @return 权限列表。
-     */
-    List<SysPerm> getPermListWithRelation(SysPerm sysPermFilter);
-
-    /**
-     * 将指定用户的指定会话的权限集合存入缓存。
-     *
-     * @param sessionId  会话Id。
-     * @param userId     用户主键Id。
-     * @param permUrlSet URL集合。
-     */
-    void putUserSysPermCache(String sessionId, String userId, Set<String> permUrlSet);
-
-    /**
-     * 将指定会话的权限集合从缓存中移除。
-     *
-     * @param sessionId 会话Id。
-     */
-    void removeUserSysPermCache(String sessionId);
-
-    /**
-     * 获取与指定用户关联的权限资源列表，已去重。
-     *
-     * @param userId 关联的用户主键Id。
-     * @return 与指定用户Id关联的权限资源列表。
-     */
-    Collection<String> getPermListByUserId(Long userId);
-
-    /**
-     * 查询权限资源地址的用户列表。同时返回详细的分配路径。
-     *
-     * @param permId    权限资源Id。
-     * @param loginName 登录名。
-     * @return 包含从权限资源到用户的完整权限分配路径信息的查询结果列表。
-     */
-    List<Map<String, Object>> getSysUserListWithDetail(Long permId, String loginName);
-
-    /**
-     * 查询权限资源地址的角色列表。同时返回详细的分配路径。
-     *
-     * @param permId   权限资源Id。
-     * @param roleName 角色名。
-     * @return 包含从权限资源到角色的权限分配路径信息的查询结果列表。
-     */
-    List<Map<String, Object>> getSysRoleListWithDetail(Long permId, String roleName);
-
-    /**
-     * 查询权限资源地址的菜单列表。同时返回详细的分配路径。
-     *
-     * @param permId   权限资源Id。
-     * @param menuName 菜单名。
-     * @return 包含从权限资源到菜单的权限分配路径信息的查询结果列表。
-     */
-    List<Map<String, Object>> getSysMenuListWithDetail(Long permId, String menuName);
-}

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

@@ -12,7 +12,7 @@ import java.util.*;
  * @author Buzhanyi
  * @date 2022-09-25
  */
-public interface SysPostService extends IBaseService<SysPost, Long> {
+public interface SysPostService extends IBaseService<SysPost, String> {
 
     /**
      * 保存新增对象。
@@ -75,7 +75,7 @@ public interface SysPostService extends IBaseService<SysPost, Long> {
      * @param orderBy 排序参数。
      * @return 查询结果集。
      */
-    List<SysPost> getSysPostListByDeptId(Long deptId, SysPost filter, String orderBy);
+    List<SysPost> getSysPostListByDeptId(String deptId, SysPost filter, String orderBy);
 
     /**
      * 获取指定用户的用户岗位多对多关联数据列表。

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

@@ -6,7 +6,7 @@ import com.ankaibei.workflow.vo.AreaInfo;
 
 import java.util.List;
 
-public interface SysRegionService extends IBaseService<SysRegion, Long> {
+public interface SysRegionService extends IBaseService<SysRegion, String> {
 
     boolean insertAll(List<AreaInfo> list);
 }

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

@@ -13,7 +13,7 @@ import java.util.*;
  * @author Buzhanyi
  * @date 2022-09-25
  */
-public interface SysRoleService extends IBaseService<SysRole, Long> {
+public interface SysRoleService extends IBaseService<SysRole, String> {
 
     /**
      * 保存新增的角色对象。

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

@@ -121,7 +121,7 @@ public interface SysUserService extends IBaseService<SysUser, String> {
      * @param orderBy    排序参数。
      * @return 用户列表。
      */
-    List<SysUser> getSysUserListByDataPermId(Long dataPermId, SysUser filter, String orderBy);
+    List<SysUser> getSysUserListByDataPermId(String dataPermId, SysUser filter, String orderBy);
 
     /**
      * 获取不属于指定数据权限的用户列表。
@@ -131,7 +131,7 @@ public interface SysUserService extends IBaseService<SysUser, String> {
      * @param orderBy    排序参数。
      * @return 用户列表。
      */
-    List<SysUser> getNotInSysUserListByDataPermId(Long dataPermId, SysUser filter, String orderBy);
+    List<SysUser> getNotInSysUserListByDataPermId(String dataPermId, SysUser filter, String orderBy);
 
     /**
      * 获取指定部门岗位的用户列表。

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

@@ -43,7 +43,7 @@ import java.util.stream.Collectors;
  */
 @Slf4j
 @Service("sysDataPermService")
-public class SysDataPermServiceImpl extends BaseService<SysDataPerm, Long> implements SysDataPermService {
+public class SysDataPermServiceImpl extends BaseService<SysDataPerm, String> implements SysDataPermService {
 
     @Autowired
     private SysDataPermMapper sysDataPermMapper;
@@ -89,7 +89,7 @@ public class SysDataPermServiceImpl extends BaseService<SysDataPerm, Long> imple
     public boolean update(
             SysDataPerm dataPerm, SysDataPerm originalDataPerm, Set<String> deptIdSet, Set<String> 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;
         }
@@ -309,16 +309,16 @@ public class SysDataPermServiceImpl extends BaseService<SysDataPerm, Long> imple
             if (StrUtil.isBlank(deptIdListString)) {
                 return CallResult.error("数据验证失败，部门列表不能为空！");
             }
-            Set<Long> deptIdSet = StrUtil.split(
-                    deptIdListString, ",").stream().map(Long::valueOf).collect(Collectors.toSet());
+            Set<String> deptIdSet = StrUtil.split(
+                    deptIdListString, ",").stream().map(String::valueOf).collect(Collectors.toSet());
             if (!sysDeptService.existAllPrimaryKeys(deptIdSet)) {
                 return CallResult.error("数据验证失败，存在不合法的部门数据，请刷新后重试！");
             }
             jsonObject.put("deptIdSet", deptIdSet);
         }
         if (StrUtil.isNotBlank(menuIdListString)) {
-            Set<Long> menuIdSet = StrUtil.split(
-                    menuIdListString, ",").stream().map(Long::valueOf).collect(Collectors.toSet());
+            Set<String> menuIdSet = StrUtil.split(
+                    menuIdListString, ",").stream().map(String::valueOf).collect(Collectors.toSet());
             if (!sysMenuService.existAllPrimaryKeys(menuIdSet)) {
                 return CallResult.error("数据验证失败，存在不合法的菜单数据，请刷新后重试！");
             }

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

@@ -32,7 +32,7 @@ import java.util.stream.Collectors;
  */
 @Slf4j
 @Service("sysDeptService")
-public class SysDeptServiceImpl extends BaseService<SysDept, Long> implements SysDeptService {
+public class SysDeptServiceImpl extends BaseService<SysDept, String> implements SysDeptService {
 
     @Autowired
     private SysDeptMapper sysDeptMapper;
@@ -91,7 +91,7 @@ public class SysDeptServiceImpl extends BaseService<SysDept, Long> implements Sy
     @Override
     public boolean update(SysDept sysDept, SysDept originalSysDept) {
         MyModelUtil.fillCommonsForUpdate(sysDept, originalSysDept);
-        UpdateWrapper<SysDept> uw = this.createUpdateQueryForNullValue(sysDept, Long.valueOf(sysDept.getDeptId()));
+        UpdateWrapper<SysDept> uw = this.createUpdateQueryForNullValue(sysDept, sysDept.getDeptId());
         if (sysDeptMapper.update(sysDept, uw) == 0) {
             return false;
         }
@@ -318,7 +318,7 @@ public class SysDeptServiceImpl extends BaseService<SysDept, Long> implements Sy
         if (sysDept == null) {
             return new LinkedList<>();
         }
-        List<SysDept> deptList = this.getListByParentId("parentId", Long.valueOf(sysDept.getParentId()));
+        List<SysDept> deptList = this.getListByParentId("parentId", sysDept.getParentId());
         Set<String> deptIdSet = deptList.stream().map(SysDept::getDeptId).collect(Collectors.toSet());
         LambdaQueryWrapper<SysDeptPost> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.in(SysDeptPost::getDeptId, deptIdSet);

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

@@ -38,7 +38,7 @@ import java.util.stream.Collectors;
  */
 @Slf4j
 @Service("sysMenuService")
-public class SysMenuServiceImpl extends BaseService<SysMenu, Long> implements SysMenuService {
+public class SysMenuServiceImpl extends BaseService<SysMenu, String> implements SysMenuService {
 
     @Autowired
     private SysMenuMapper sysMenuMapper;
@@ -121,7 +121,7 @@ public class SysMenuServiceImpl extends BaseService<SysMenu, Long> implements Sy
     public boolean update(SysMenu sysMenu, SysMenu originalSysMenu, Set<String> permCodeIdSet) {
         MyModelUtil.fillCommonsForUpdate(sysMenu, originalSysMenu);
         sysMenu.setMenuType(originalSysMenu.getMenuType());
-        UpdateWrapper<SysMenu> uw = this.createUpdateQueryForNullValue(sysMenu, Long.valueOf(sysMenu.getMenuId()));
+        UpdateWrapper<SysMenu> uw = this.createUpdateQueryForNullValue(sysMenu, sysMenu.getMenuId());
         if (sysMenuMapper.update(sysMenu, uw) != 1) {
             return false;
         }
@@ -233,8 +233,8 @@ public class SysMenuServiceImpl extends BaseService<SysMenu, Long> implements Sy
         }
         JSONObject jsonObject = null;
         if (StringUtils.isNotBlank(permCodeIdListString)) {
-            Set<Long> permCodeIdSet = Arrays.stream(
-                    permCodeIdListString.split(",")).map(Long::valueOf).collect(Collectors.toSet());
+            Set<String> permCodeIdSet = Arrays.stream(
+                    permCodeIdListString.split(",")).map(String::valueOf).collect(Collectors.toSet());
             if (!sysPermCodeService.existAllPrimaryKeys(permCodeIdSet)) {
                 return CallResult.error("数据验证失败，存在不合法的权限字，请刷新后重试！");
             }

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

@@ -33,7 +33,7 @@ import java.util.stream.Collectors;
  */
 @Slf4j
 @Service("sysPermCodeService")
-public class SysPermCodeServiceImpl extends BaseService<SysPermCode, Long> implements SysPermCodeService {
+public class SysPermCodeServiceImpl extends BaseService<SysPermCode, String> implements SysPermCodeService {
 
     @Autowired
     private SysPermCodeMapper sysPermCodeMapper;
@@ -117,7 +117,7 @@ public class SysPermCodeServiceImpl extends BaseService<SysPermCode, Long> imple
         MyModelUtil.fillCommonsForUpdate(sysPermCode, originalSysPermCode);
         sysPermCode.setParentId(originalSysPermCode.getParentId());
         UpdateWrapper<SysPermCode> uw =
-                this.createUpdateQueryForNullValue(sysPermCode, Long.valueOf(sysPermCode.getPermCodeId()));
+                this.createUpdateQueryForNullValue(sysPermCode, sysPermCode.getPermCodeId());
         if (sysPermCodeMapper.update(sysPermCode, uw) != 1) {
             return false;
         }
@@ -187,8 +187,8 @@ public class SysPermCodeServiceImpl extends BaseService<SysPermCode, Long> imple
         }
         JSONObject jsonObject = null;
         if (StringUtils.isNotBlank(permIdListString)) {
-            Set<Long> permIdSet = Arrays.stream(
-                    permIdListString.split(",")).map(Long::valueOf).collect(Collectors.toSet());
+            Set<String> permIdSet = Arrays.stream(
+                    permIdListString.split(",")).map(String::valueOf).collect(Collectors.toSet());
             if (!sysPermService.existAllPrimaryKeys(permIdSet)) {
                 return CallResult.error("数据验证失败，存在不合法的权限资源，请刷新后重试！");
             }

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

@@ -24,7 +24,7 @@ import java.util.List;
  */
 @Slf4j
 @Service("sysPermModuleService")
-public class SysPermModuleServiceImpl extends BaseService<SysPermModule, Long> implements SysPermModuleService {
+public class SysPermModuleServiceImpl extends BaseService<SysPermModule, String> implements SysPermModuleService {
 
     @Autowired
     private SysPermModuleMapper sysPermModuleMapper;

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

@@ -35,7 +35,7 @@ import java.util.concurrent.TimeUnit;
  */
 @Slf4j
 @Service("sysPermService")
-public class SysPermServiceImpl extends BaseService<SysPerm, Long> implements SysPermService {
+public class SysPermServiceImpl extends BaseService<SysPerm, String> implements SysPermService {
 
     @Autowired
     private SysPermMapper sysPermMapper;

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

@@ -32,7 +32,7 @@ import java.util.Set;
  */
 @Slf4j
 @Service("sysPostService")
-public class SysPostServiceImpl extends BaseService<SysPost, Long> implements SysPostService {
+public class SysPostServiceImpl extends BaseService<SysPost, String> implements SysPostService {
 
     @Autowired
     private SysPostMapper sysPostMapper;
@@ -162,7 +162,7 @@ public class SysPostServiceImpl extends BaseService<SysPost, Long> implements Sy
      * @return 查询结果集。
      */
     @Override
-    public List<SysPost> getSysPostListByDeptId(Long deptId, SysPost filter, String orderBy) {
+    public List<SysPost> getSysPostListByDeptId(String deptId, SysPost filter, String orderBy) {
         List<SysPost> resultList = sysPostMapper.getSysPostListByDeptId(deptId, filter, orderBy);
         this.buildRelationForDataList(resultList, MyRelationParam.dictOnly());
         return resultList;

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

@@ -18,7 +18,7 @@ import java.util.List;
 
 @Slf4j
 @Service
-public class SysRegionServiceImpl extends BaseService<SysRegion, Long> implements SysRegionService {
+public class SysRegionServiceImpl extends BaseService<SysRegion, String> implements SysRegionService {
 
     @Autowired
     private SysRegionMapper sysRegionMapper;

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

@@ -32,7 +32,7 @@ import java.util.stream.Collectors;
  */
 @Slf4j
 @Service("sysRoleService")
-public class SysRoleServiceImpl extends BaseService<SysRole, Long> implements SysRoleService {
+public class SysRoleServiceImpl extends BaseService<SysRole, String> implements SysRoleService {
 
     @Autowired
     private SysRoleMapper sysRoleMapper;
@@ -189,8 +189,8 @@ public class SysRoleServiceImpl extends BaseService<SysRole, Long> implements Sy
     public CallResult verifyRelatedData(SysRole sysRole, SysRole originalSysRole, String menuIdListString) {
         JSONObject jsonObject = null;
         if (StringUtils.isNotBlank(menuIdListString)) {
-            Set<Long> menuIdSet = Arrays.stream(
-                    menuIdListString.split(",")).map(Long::valueOf).collect(Collectors.toSet());
+            Set<String> menuIdSet = Arrays.stream(
+                    menuIdListString.split(",")).map(String::valueOf).collect(Collectors.toSet());
             if (!sysMenuService.existAllPrimaryKeys(menuIdSet)) {
                 return CallResult.error("数据验证失败，存在不合法的菜单权限，请刷新后重试！");
             }

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

@@ -309,7 +309,7 @@ public class SysUserServiceImpl extends BaseService<SysUser, String> implements
      * @return 用户列表。
      */
     @Override
-    public List<SysUser> getSysUserListByDataPermId(Long dataPermId, SysUser filter, String orderBy) {
+    public List<SysUser> getSysUserListByDataPermId(String dataPermId, SysUser filter, String orderBy) {
         return sysUserMapper.getSysUserListByDataPermId(dataPermId, filter, orderBy);
     }
 
@@ -322,7 +322,7 @@ public class SysUserServiceImpl extends BaseService<SysUser, String> implements
      * @return 用户列表。
      */
     @Override
-    public List<SysUser> getNotInSysUserListByDataPermId(Long dataPermId, SysUser filter, String orderBy) {
+    public List<SysUser> getNotInSysUserListByDataPermId(String dataPermId, SysUser filter, String orderBy) {
         return sysUserMapper.getNotInSysUserListByDataPermId(dataPermId, filter, orderBy);
     }
 
@@ -403,8 +403,8 @@ public class SysUserServiceImpl extends BaseService<SysUser, String> implements
         if (StrUtil.isBlank(roleIds)) {
             return CallResult.error("数据验证失败，用户的角色数据不能为空！");
         }
-        Set<Long> roleIdSet = Arrays.stream(
-                roleIds.split(",")).map(Long::valueOf).collect(Collectors.toSet());
+        Set<String> roleIdSet = Arrays.stream(
+                roleIds.split(",")).map(String::valueOf).collect(Collectors.toSet());
         if (!sysRoleService.existAllPrimaryKeys(roleIdSet)) {
             return CallResult.error("数据验证失败，存在不合法的用户角色，请刷新后重试！");
         }
@@ -412,15 +412,15 @@ public class SysUserServiceImpl extends BaseService<SysUser, String> implements
         if (StrUtil.isBlank(dataPermIds)) {
             return CallResult.error("数据验证失败，用户的数据权限不能为空！");
         }
-        Set<Long> dataPermIdSet = Arrays.stream(
-                dataPermIds.split(",")).map(Long::valueOf).collect(Collectors.toSet());
+        Set<String> dataPermIdSet = Arrays.stream(
+                dataPermIds.split(",")).map(String::valueOf).collect(Collectors.toSet());
         if (!sysDataPermService.existAllPrimaryKeys(dataPermIdSet)) {
             return CallResult.error("数据验证失败，存在不合法的数据权限，请刷新后重试！");
         }
         jsonObject.put("dataPermIdSet", dataPermIdSet);
         //这里是基于字典的验证。
         if (this.needToVerify(sysUser, originalSysUser, SysUser::getDeptId)
-                && !sysDeptService.existId(Long.valueOf(sysUser.getDeptId()))) {
+                && !sysDeptService.existId(sysUser.getDeptId())) {
             return CallResult.error("数据验证失败，关联的用户部门Id并不存在，请刷新后重试！");
         }
         return CallResult.ok(jsonObject);

common/common-flow/src/main/java/com/ankaibei/workFlow/common/flow/controller/FlowCategoryController.java

@@ -162,7 +162,7 @@ public class FlowCategoryController {
      * @return 应答结果对象，包含对象详情。
      */
     @GetMapping("/view")
-    public ResponseResult<FlowCategoryVo> view(@RequestParam Long categoryId) {
+    public ResponseResult<FlowCategoryVo> view(@RequestParam String categoryId) {
         if (MyCommonUtil.existBlankArgument(categoryId)) {
             return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
         }
@@ -195,7 +195,7 @@ public class FlowCategoryController {
      * @return 应答结果对象，包含字典形式的数据集合。
      */
     @PostMapping("/listDictByIds")
-    public ResponseResult<List<Map<String, Object>>> listDictByIds(@MyRequestBody List<Long> dictIds) {
+    public ResponseResult<List<Map<String, Object>>> listDictByIds(@MyRequestBody List<String> dictIds) {
         List<FlowCategory> resultList = flowCategoryService.getInList(new HashSet<>(dictIds));
         return ResponseResult.success(BeanQuery.select(
                 "categoryId as id", "name as name").executeFrom(resultList));

common/common-flow/src/main/java/com/ankaibei/workFlow/common/flow/controller/FlowEntryController.java

@@ -226,7 +226,7 @@ public class FlowEntryController {
      * @return 应答结果对象，包含对象详情。
      */
     @GetMapping("/view")
-    public ResponseResult<FlowEntryVo> view(@RequestParam Long entryId) {
+    public ResponseResult<FlowEntryVo> view(@RequestParam String entryId) {
         if (MyCommonUtil.existBlankArgument(entryId)) {
             return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
         }

common/common-flow/src/main/java/com/ankaibei/workFlow/common/flow/controller/FlowEntryVariableController.java

@@ -138,7 +138,7 @@ public class FlowEntryVariableController {
      * @return 应答结果对象，包含对象详情。
      */
     @GetMapping("/view")
-    public ResponseResult<FlowEntryVariableVo> view(@RequestParam Long variableId) {
+    public ResponseResult<FlowEntryVariableVo> view(@RequestParam String variableId) {
         if (MyCommonUtil.existBlankArgument(variableId)) {
             return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
         }

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

@@ -11,7 +11,7 @@ import java.util.List;
  * @author Buzhanyi
  * @date 2022-09-25
  */
-public interface FlowCategoryService extends IBaseService<FlowCategory, Long> {
+public interface FlowCategoryService extends IBaseService<FlowCategory, String> {
 
     /**
      * 保存新增对象。

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

@@ -13,7 +13,7 @@ import java.util.Set;
  * @author Buzhanyi
  * @date 2022-09-25
  */
-public interface FlowEntryService extends IBaseService<FlowEntry, Long> {
+public interface FlowEntryService extends IBaseService<FlowEntry, String> {
 
     /**
      * 保存新增对象。

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

@@ -11,7 +11,7 @@ import java.util.*;
  * @author Buzhanyi
  * @date 2022-09-25
  */
-public interface FlowEntryVariableService extends IBaseService<FlowEntryVariable, Long> {
+public interface FlowEntryVariableService extends IBaseService<FlowEntryVariable, String> {
 
     /**
      * 保存新增对象。

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

@@ -14,7 +14,7 @@ import java.util.List;
  * @author Buzhanyi
  * @date 2022-09-25
  */
-public interface FlowMessageService extends IBaseService<FlowMessage, Long> {
+public interface FlowMessageService extends IBaseService<FlowMessage, String> {
 
     /**
      * 保存新增对象。

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

@@ -9,7 +9,7 @@ import com.ankaibei.workFlow.common.flow.model.FlowMultiInstanceTrans;
  * @author Buzhanyi
  * @date 2022-09-25
  */
-public interface FlowMultiInstanceTransService extends IBaseService<FlowMultiInstanceTrans, Long> {
+public interface FlowMultiInstanceTransService extends IBaseService<FlowMultiInstanceTrans, String> {
 
     /**
      * 保存新增对象。

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

@@ -11,7 +11,7 @@ import java.util.*;
  * @author Buzhanyi
  * @date 2022-09-25
  */
-public interface FlowTaskCommentService extends IBaseService<FlowTaskComment, Long> {
+public interface FlowTaskCommentService extends IBaseService<FlowTaskComment, String> {
 
     /**
      * 保存新增对象。

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

@@ -15,7 +15,7 @@ import java.util.*;
  * @author Buzhanyi
  * @date 2022-09-25
  */
-public interface FlowWorkOrderService extends IBaseService<FlowWorkOrder, Long> {
+public interface FlowWorkOrderService extends IBaseService<FlowWorkOrder, String> {
 
     /**
      * 保存新增对象。

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

@@ -27,7 +27,7 @@ import java.util.List;
  */
 @Slf4j
 @Service("flowCategoryService")
-public class FlowCategoryServiceImpl extends BaseService<FlowCategory, Long> implements FlowCategoryService {
+public class FlowCategoryServiceImpl extends BaseService<FlowCategory, String> implements FlowCategoryService {
 
     @Autowired
     private FlowCategoryMapper flowCategoryMapper;
@@ -80,7 +80,7 @@ public class FlowCategoryServiceImpl extends BaseService<FlowCategory, Long> imp
         flowCategory.setCreateTime(originalFlowCategory.getCreateTime());
         // 这里重点提示，在执行主表数据更新之前，如果有哪些字段不支持修改操作，请用原有数据对象字段替换当前数据字段。
         UpdateWrapper<FlowCategory> uw =
-                this.createUpdateQueryForNullValue(flowCategory, Long.valueOf(flowCategory.getCategoryId()));
+                this.createUpdateQueryForNullValue(flowCategory, flowCategory.getCategoryId());
         return flowCategoryMapper.update(flowCategory, uw) == 1;
     }
 

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

@@ -57,7 +57,7 @@ import java.util.stream.Collectors;
  */
 @Slf4j
 @Service("flowEntryService")
-public class FlowEntryServiceImpl extends BaseService<FlowEntry, Long> implements FlowEntryService {
+public class FlowEntryServiceImpl extends BaseService<FlowEntry, String> implements FlowEntryService {
 
     @Autowired
     private FlowEntryMapper flowEntryMapper;
@@ -427,7 +427,7 @@ public class FlowEntryServiceImpl extends BaseService<FlowEntry, Long> implement
     public CallResult verifyRelatedData(FlowEntry flowEntry, FlowEntry originalFlowEntry) {
         String errorMessageFormat = "数据验证失败，关联的%s并不存在，请刷新后重试！";
         if (this.needToVerify(flowEntry, originalFlowEntry, FlowEntry::getCategoryId)
-                && !flowCategoryService.existId(Long.valueOf(flowEntry.getCategoryId()))) {
+                && !flowCategoryService.existId(flowEntry.getCategoryId())) {
             return CallResult.error(String.format(errorMessageFormat, "流程类别Id"));
         }
         return CallResult.ok();

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

@@ -25,7 +25,7 @@ import java.util.*;
  */
 @Slf4j
 @Service("flowEntryVariableService")
-public class FlowEntryVariableServiceImpl extends BaseService<FlowEntryVariable, Long> implements FlowEntryVariableService {
+public class FlowEntryVariableServiceImpl extends BaseService<FlowEntryVariable, String> implements FlowEntryVariableService {
 
     @Autowired
     private FlowEntryVariableMapper flowEntryVariableMapper;
@@ -69,7 +69,7 @@ public class FlowEntryVariableServiceImpl extends BaseService<FlowEntryVariable,
     public boolean update(FlowEntryVariable flowEntryVariable, FlowEntryVariable originalFlowEntryVariable) {
         flowEntryVariable.setCreateTime(originalFlowEntryVariable.getCreateTime());
         // 这里重点提示，在执行主表数据更新之前，如果有哪些字段不支持修改操作，请用原有数据对象字段替换当前数据字段。
-        UpdateWrapper<FlowEntryVariable> uw = this.createUpdateQueryForNullValue(flowEntryVariable, Long.valueOf(flowEntryVariable.getVariableId()));
+        UpdateWrapper<FlowEntryVariable> uw = this.createUpdateQueryForNullValue(flowEntryVariable, flowEntryVariable.getVariableId());
         return flowEntryVariableMapper.update(flowEntryVariable, uw) == 1;
     }
 

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

@@ -43,7 +43,7 @@ import java.util.*;
  */
 @Slf4j
 @Service("flowMessageService")
-public class FlowMessageServiceImpl extends BaseService<FlowMessage, Long> implements FlowMessageService {
+public class FlowMessageServiceImpl extends BaseService<FlowMessage, String> implements FlowMessageService {
 
     @Autowired
     private FlowMessageMapper flowMessageMapper;

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

@@ -23,8 +23,7 @@ import java.util.Date;
  */
 @Slf4j
 @Service("flowMultiInstanceTransService")
-public class FlowMultiInstanceTransServiceImpl
-        extends BaseService<FlowMultiInstanceTrans, Long> implements FlowMultiInstanceTransService {
+public class FlowMultiInstanceTransServiceImpl extends BaseService<FlowMultiInstanceTrans, String> implements FlowMultiInstanceTransService {
 
     @Autowired
     private FlowMultiInstanceTransMapper flowMultiInstanceTransMapper;

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

@@ -26,7 +26,7 @@ import java.util.*;
  */
 @Slf4j
 @Service("flowTaskCommentService")
-public class FlowTaskCommentServiceImpl extends BaseService<FlowTaskComment, Long> implements FlowTaskCommentService {
+public class FlowTaskCommentServiceImpl extends BaseService<FlowTaskComment, String> implements FlowTaskCommentService {
 
     @Autowired
     private FlowTaskCommentMapper flowTaskCommentMapper;

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

@@ -251,10 +251,10 @@ public class FlowTaskExtServiceImpl extends BaseService<FlowTaskExt, String> imp
         if (CollUtil.isEmpty(formVariableElements)) {
             return null;
         }
-        Set<Long> variableIdSet = new HashSet<>();
+        Set<String> variableIdSet = new HashSet<>();
         for (ExtensionElement e : formVariableElements) {
             String id = e.getAttributeValue(null, "id");
-            variableIdSet.add(Long.parseLong(id));
+            variableIdSet.add(id);
         }
         List<FlowEntryVariable> variableList = flowEntryVariableService.getInList(variableIdSet);
         List<JSONObject> resultList = new LinkedList<>();

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

@@ -45,7 +45,7 @@ import java.util.stream.Collectors;
  */
 @Slf4j
 @Service("flowWorkOrderService")
-public class FlowWorkOrderServiceImpl extends BaseService<FlowWorkOrder, Long> implements FlowWorkOrderService {
+public class FlowWorkOrderServiceImpl extends BaseService<FlowWorkOrder, String> implements FlowWorkOrderService {
 
     @Autowired
     private FlowWorkOrderMapper flowWorkOrderMapper;