ID统一用字符串

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

@@ -60,7 +60,7 @@ public class SysUser {
      * 角色组
      */
 
-    private Long[] roleIds;
+    private String[] roleIds;
 
     private Boolean isAdmin;
 

application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/ankaibei/api/CostInFoApi.java

@@ -24,5 +24,5 @@ public interface CostInFoApi extends ApiMixin<CostInfoVo, Integer> {
 
     ResMsg findCostInfoDetails(CostInfoVo costInfoVo);
 
-    ResMsg findProjectAuditList(Long id, UserInfoVo userInfoVo);
+    ResMsg findProjectAuditList(String id, UserInfoVo userInfoVo);
 }

application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/ankaibei/api/CostInFoServiceApi.java

@@ -52,7 +52,7 @@ public class CostInFoServiceApi implements CostInFoApi {
     }
 
     @Override
-    public ResMsg findProjectAuditList(Long id, UserInfoVo userInfoVo) {
+    public ResMsg findProjectAuditList(String id, UserInfoVo userInfoVo) {
 
         return costInfoService.findProjectAuditList(id, userInfoVo);
     }

application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/ankaibei/api/ProjectTeamApi.java

@@ -31,7 +31,7 @@ public interface ProjectTeamApi extends ApiMixin<ProjectTeamInfoVo, Integer> {
 
     ResMsg updateUser(UserInfoVo userInfoVo);
 
-    ResMsg findById(Long userInfoVo);
+    ResMsg findById(String userInfoVo);
 
     ResMsg findPrincipal();
 
@@ -43,5 +43,5 @@ public interface ProjectTeamApi extends ApiMixin<ProjectTeamInfoVo, Integer> {
 
     ResMsg removeUser(ProjectTeamInfoVo projectTeamInfoVo);
 
-    ResMsg findUserProject(Long userId);
+    ResMsg findUserProject(String userId);
 }

application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/ankaibei/api/ProjectTeamServiceApi.java

@@ -61,7 +61,7 @@ public class ProjectTeamServiceApi implements ProjectTeamApi {
     }
 
     @Override
-    public ResMsg findById(Long userId) {
+    public ResMsg findById(String userId) {
         return projectTeamService.findById(userId);
     }
 
@@ -97,7 +97,7 @@ public class ProjectTeamServiceApi implements ProjectTeamApi {
     }
 
     @Override
-    public ResMsg findUserProject(Long userId) {
+    public ResMsg findUserProject(String userId) {
 
         return projectTeamService.findUserProject(userId);
     }

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

@@ -63,8 +63,7 @@ public class ApplyForCostController {
      */
     @RequestMapping("/addCommunication")
     public ResMsg addCommunication(@RequestBody CommunicationInfoVo communicationInfoVo) {
-        Long userId = TokenData.takeFromRequest().getUserId();
-        communicationInfoVo.setCreateUser(String.valueOf(userId));
+        communicationInfoVo.setCreateUser(TokenData.takeFromRequest().getUserId());
         return applyForCostService.addCommunication(communicationInfoVo);
     }
 
@@ -76,8 +75,7 @@ public class ApplyForCostController {
      */
     @RequestMapping("/addpurchase")
     public ResMsg addpurchase(@RequestBody PurchaseInfoVo purchaseInfoVo) {
-        Long userId = TokenData.takeFromRequest().getUserId();
-        purchaseInfoVo.setCreateUser(String.valueOf(userId));
+        purchaseInfoVo.setCreateUser(TokenData.takeFromRequest().getUserId());
         return applyForCostService.addpurchase(purchaseInfoVo);
     }
 
@@ -89,8 +87,7 @@ public class ApplyForCostController {
      */
     @RequestMapping("/addRest")
     public ResMsg addRest(@RequestBody RestsInfoVo restsInfoVo) {
-        Long userId = TokenData.takeFromRequest().getUserId();
-        restsInfoVo.setCreateUser(String.valueOf(userId));
+        restsInfoVo.setCreateUser(TokenData.takeFromRequest().getUserId());
         return applyForCostService.addRest(restsInfoVo);
     }
 
@@ -102,8 +99,7 @@ public class ApplyForCostController {
      */
     @RequestMapping("/trafficExpenseApply")
     public ResMsg trafficExpenseApply(@RequestBody TrafficExpenseVo trafficExpenseVo, HttpServletRequest request) {
-        Long userId = TokenData.takeFromRequest().getUserId();
-        trafficExpenseVo.setApplicant(String.valueOf(userId));
+        trafficExpenseVo.setApplicant(TokenData.takeFromRequest().getUserId());
         return applyForCostService.trafficExpenseApply(trafficExpenseVo);
     }
 
@@ -115,8 +111,7 @@ public class ApplyForCostController {
      */
     @RequestMapping("/repastExpenseApply")
     public ResMsg repastExpenseApply(@RequestBody RepastExpenseVo RepastExpenseVo, HttpServletRequest request) {
-        Long userId = TokenData.takeFromRequest().getUserId();
-        RepastExpenseVo.setApplicant(String.valueOf(userId));
+        RepastExpenseVo.setApplicant(TokenData.takeFromRequest().getUserId());
         return applyForCostService.repastExpenseApply(RepastExpenseVo);
     }
 
@@ -128,8 +123,7 @@ public class ApplyForCostController {
      */
     @RequestMapping("/travelExpenseApply")
     public ResMsg travelExpenseApply(@RequestBody TravelExpenseVo travelExpenseVo, HttpServletRequest request) {
-        Long userId = TokenData.takeFromRequest().getUserId();
-        travelExpenseVo.setApplicant(String.valueOf(userId));
+        travelExpenseVo.setApplicant(TokenData.takeFromRequest().getUserId());
         return applyForCostService.travelExpenseApply(travelExpenseVo);
     }
 

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

@@ -153,7 +153,7 @@ public class CostInfoController {
      */
     @RequestMapping("/findProjectAuditList")
     public ResMsg findProjectAuditList(@RequestBody UserInfoVo userInfoVo) {
-        Long id = TokenData.takeFromRequest().getUserId();
+        String id = TokenData.takeFromRequest().getUserId();
         return costInFoApi.findProjectAuditList(id, userInfoVo);
     }
 
@@ -396,18 +396,18 @@ public class CostInfoController {
         List<FlowTaskVo> flowTaskVoListByQueryType = new ArrayList<>();
         Set<Long> entryIdList = new HashSet<>();
         for (FlowTaskVo taskVo : flowTaskVoList) {
-            entryIdList.add(taskVo.getEntryId());
+            entryIdList.add(Long.valueOf(taskVo.getEntryId()));
         }
         List<FlowEntry> entryList = flowEntryService.getInList(entryIdList);
         //获取流程所在的分类
         Set<Long> categoryIdList = new HashSet<>();
         for (FlowEntry entry : entryList) {
-            categoryIdList.add(entry.getCategoryId());
+            categoryIdList.add(Long.valueOf(entry.getCategoryId()));
         }
         List<FlowCategory> flowCategoryList = categoryService.getInList(categoryIdList);
         //给流程任务对象的流程分类字段赋值
         for (FlowTaskVo taskVo : flowTaskVoList) {
-            Long entryId = taskVo.getEntryId();
+            String entryId = taskVo.getEntryId();
             for (FlowEntry entry : entryList) {
                 if (entry.getEntryId().equals(entryId)) {
                     for (FlowCategory category : flowCategoryList) {

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

@@ -39,8 +39,7 @@ public class ManHourController {
      */
     @RequestMapping("/addManHour")
     public ResMsg addManHour(@RequestBody ManHourInfoVo manHourInfoVo, HttpServletRequest request) {
-        Long userId = TokenData.takeFromRequest().getUserId();
-        manHourInfoVo.setCreateUser(String.valueOf(userId));
+        manHourInfoVo.setCreateUser(TokenData.takeFromRequest().getUserId());
         return manHourInfoApi.addManHour(manHourInfoVo);
     }
 

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

@@ -145,8 +145,7 @@ public class ProjectInfoController {
      */
     @RequestMapping("/findPrincipalProject")
     public ResMsg findPrincipalProject() {
-        Long userId = TokenData.takeFromRequest().getUserId();
-        return projectInfoApi.findPrincipalProject(String.valueOf(userId));
+        return projectInfoApi.findPrincipalProject(TokenData.takeFromRequest().getUserId());
     }
 
 

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

@@ -115,8 +115,7 @@ public class ProjectTeamController {
      */
     @RequestMapping("/findUserProject")
     public ResMsg findUserProject() {
-        Long userId = TokenData.takeFromRequest().getUserId();
-        return projectTeamApi.findUserProject(userId);
+        return projectTeamApi.findUserProject(TokenData.takeFromRequest().getUserId());
     }
 
     /**
@@ -191,8 +190,7 @@ public class ProjectTeamController {
      */
     @RequestMapping("/findById")
     public ResMsg findById(HttpServletRequest request) {
-        Long userId = TokenData.takeFromRequest().getUserId();
-        return projectTeamApi.findById(userId);
+        return projectTeamApi.findById(TokenData.takeFromRequest().getUserId());
     }
 
     /**

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

@@ -165,7 +165,6 @@ public class SubmitUserTaskController {
         }
         OnlineDatasource datasource = datasourceResult.getData();
         OnlineTable masterTable = datasource.getMasterTable();
-        Long datasourceId = datasource.getDatasourceId();
         ProcessInstance instance = flowApiService.getProcessInstance(subVo.getProcessInstanceId());
         String dataId = instance.getBusinessKey();
         // 这里把传阅数据放到任务变量中，是为了避免给流程数据操作方法增加额外的方法调用参数。
@@ -178,7 +177,7 @@ public class SubmitUserTaskController {
         FlowTaskComment flowTaskComment = BeanUtil.copyProperties(subVo.getFlowTaskCommentDto(), FlowTaskComment.class);
         if (StrUtil.isBlank(dataId)) {
             return this.submitNewTaskOther(subVo.getProcessInstanceId(), subVo.getTaskId(),
-                    flowTaskComment, subVo.getTaskVariableData(), masterTable, subVo.getMasterData(), subVo.getSlaveData(), datasourceId);
+                    flowTaskComment, subVo.getTaskVariableData(), masterTable, subVo.getMasterData(), subVo.getSlaveData(), datasource.getDatasourceId());
         }
         try {
             if (StrUtil.equals(flowTaskComment.getApprovalType(), FlowApprovalType.TRANSFER)) {
@@ -188,7 +187,7 @@ public class SubmitUserTaskController {
                 }
             }
             updateAndTakeTask(
-                    subVo, task, flowTaskComment, masterTable, dataId, datasourceId);
+                    subVo, task, flowTaskComment, masterTable, dataId, datasource.getDatasourceId());
         } catch (FlowOperationException e) {
             log.error("Failed to call [FlowOnlineOperationService.updateAndTakeTask]", e);
             return ResMsg.newInstance(CodeEnum.DATA_VALIDATED_FAILED, e.getMessage());
@@ -204,7 +203,7 @@ public class SubmitUserTaskController {
             OnlineTable masterTable,
             JSONObject masterData,
             JSONObject slaveData,
-            Long datasourceId) {
+            String datasourceId) {
         ResponseResult<List<ColumnData>> columnDataListResult =
                 onlineOperationHelper.buildTableData(masterTable, masterData, false, null);
         if (!columnDataListResult.isSuccess()) {
@@ -278,7 +277,7 @@ public class SubmitUserTaskController {
             FlowTaskComment flowTaskComment,
             OnlineTable masterTable,
             String masterDataId,
-            Long datasourceId) {
+            String datasourceId) {
         int flowStatus = FlowTaskStatus.APPROVING;
         if (flowTaskComment.getApprovalType().equals(FlowApprovalType.REFUSE)) {
             flowStatus = FlowTaskStatus.REFUSED;
@@ -289,9 +288,8 @@ public class SubmitUserTaskController {
         this.handleMasterTableData(masterTable, subVo.getMasterData(), masterDataId);
         if (subVo.getSlaveData() != null) {
             for (Map.Entry<String, Object> relationEntry : subVo.getSlaveData().entrySet()) {
-                Long relationId = Long.parseLong(relationEntry.getKey());
                 flowOnlineOperationServiceImpl.handleSlaveTableData(
-                        relationId, relationEntry.getValue(), datasourceId, masterTable, subVo.getMasterData(), masterDataId);
+                        relationEntry.getKey(), relationEntry.getValue(), datasourceId, masterTable, subVo.getMasterData(), masterDataId);
             }
         }
         if (flowTaskComment.getApprovalType().equals(FlowApprovalType.STOP)) {

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

@@ -72,8 +72,7 @@ public class TaskInfoController {
      */
     @RequestMapping("/addTaskInfo")
     public ResMsg addTaskInfo(@RequestBody TaskInfoVo taskInfoVo) {
-        Long userId = TokenData.takeFromRequest().getUserId();
-        taskInfoVo.setTaskCreator(String.valueOf(userId));
+        taskInfoVo.setTaskCreator(TokenData.takeFromRequest().getUserId());
         return taskInfoApi.addTaskInfo(taskInfoVo);
     }
 

application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/ankaibei/entity/CostInfoEntity.java

@@ -22,7 +22,7 @@ public class CostInfoEntity {
     private BigDecimal performAmount;
     private Date happenDate;
     private String projectName;
-    private Long proposer;
+    private String proposer;
     private Date paymentDate;
     private Integer applyCostId;
     private Date createDate;
@@ -155,11 +155,11 @@ public class CostInfoEntity {
 
     @Basic
     @Column(name = "proposer")
-    public Long getProposer() {
+    public String getProposer() {
         return proposer;
     }
 
-    public void setProposer(Long proposer) {
+    public void setProposer(String proposer) {
         this.proposer = proposer;
     }
 
@@ -185,10 +185,14 @@ public class CostInfoEntity {
 
     @Override
     public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
         CostInfoEntity that = (CostInfoEntity) o;
-        return costId == that.costId && Objects.equals(costType, that.costType) && Objects.equals(costStatus, that.costStatus) && Objects.equals(relevanceUser, that.relevanceUser) && Objects.equals(performAmount, that.performAmount) && Objects.equals(happenDate, that.happenDate) && Objects.equals(projectName, that.projectName) && Objects.equals(proposer, that.proposer) && Objects.equals(paymentDate, that.paymentDate) && Objects.equals(applyCostId, that.applyCostId);
+        return costId.equals(that.costId) && Objects.equals(costType, that.costType) && Objects.equals(costStatus, that.costStatus) && Objects.equals(relevanceUser, that.relevanceUser) && Objects.equals(performAmount, that.performAmount) && Objects.equals(happenDate, that.happenDate) && Objects.equals(projectName, that.projectName) && Objects.equals(proposer, that.proposer) && Objects.equals(paymentDate, that.paymentDate) && Objects.equals(applyCostId, that.applyCostId);
     }
 
     @Override

application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/ankaibei/mapper/ProjectAuditInfoMapper.java

@@ -22,5 +22,5 @@ public interface ProjectAuditInfoMapper extends JpaRepository<ProjectAuditInfoEn
     @Query(value = "SELECT p.project_audit_id projectAuditId,p.project_name projectName,p.printcipal printcipal,p.create_date createDate," +
             "p.audit_status auditStatus,p.matter matter from project_audit_info p WHERE p.printcipal = ?1 "
             , countQuery = "SELECT count(1) WHERE p.printcipal = ?1 ", nativeQuery = true)
-    Page<Map<String, String>> findByPrintcipalEquals(Long printcipal, Pageable page);
+    Page<Map<String, String>> findByPrintcipalEquals(String printcipal, Pageable page);
 }

application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/ankaibei/mapper/RelevanceProjectInfoMapper.java

@@ -45,7 +45,7 @@ public interface RelevanceProjectInfoMapper extends JpaRepository<RelevanceProje
      */
     @Query(value = "SELECT p.project_team_id projectTeamId FROM relevance_project_info p WHERE p.user_id = ?1 ",
             countQuery = "SELECT count(1) FROM relevance_project_info p WHERE p.user_id = ?1 ", nativeQuery = true)
-    List<String> findByUserId(Long userId);
+    List<String> findByUserId(String userId);
 
     /**
      * 根据用户id 项目组id查询该用户是否存在这个项目组

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

@@ -25,5 +25,5 @@ public interface CostInfoService {
 
     ResMsg findCostInfoDetails(CostInfoEntity costInfoEntity);
 
-    ResMsg findProjectAuditList(Long id, UserInfoVo userInfoVo);
+    ResMsg findProjectAuditList(String id, UserInfoVo userInfoVo);
 }

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

@@ -29,7 +29,7 @@ public interface ProjectTeamService {
 
     ResMsg updateUser(UserInfoEntity userInfoEntity);
 
-    ResMsg findById(Long userId);
+    ResMsg findById(String userId);
 
     ResMsg findPrincipal();
 
@@ -41,5 +41,5 @@ public interface ProjectTeamService {
 
     ResMsg removeUser(ProjectTeamInfoEntity projectTeamInfoEntity, List<Long> userIds);
 
-    ResMsg findUserProject(Long userId);
+    ResMsg findUserProject(String userId);
 }

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

@@ -108,7 +108,7 @@ public class ApplyForCostServiceImpl implements ApplyForCostService {
         costInfoEntity.setPerformAmount(communicationInfoVo.getTotalMoney());
         costInfoEntity.setHappenDate(communicationInfoVo.getCreateDate());
         costInfoEntity.setPaymentDate(communicationInfoVo.getEndDate());
-        costInfoEntity.setProposer(Long.valueOf(communicationInfoVo.getCreateUser()));
+        costInfoEntity.setProposer(communicationInfoVo.getCreateUser());
         costInfoEntity.setApplyCostId(save.getCommunicationId());
         costInfoEntity.setProcessInstanceId(map.get("processInstanceId"));
         costInfoEntity.setProcessDefinitionId(map.get("processDefinitionId"));
@@ -167,7 +167,7 @@ public class ApplyForCostServiceImpl implements ApplyForCostService {
         costInfoEntity.setProjectName(purchaseInfoVo.getProjectName());
         costInfoEntity.setPerformAmount(purchaseInfoVo.getTotalMoney());
         costInfoEntity.setHappenDate(purchaseInfoVo.getPurchaseDate());
-        costInfoEntity.setProposer(Long.valueOf(purchaseInfoVo.getCreateUser()));
+        costInfoEntity.setProposer(purchaseInfoVo.getCreateUser());
         costInfoEntity.setApplyCostId(save.getPurchaseId());
         costInfoEntity.setProcessInstanceId(map.get("processInstanceId"));
         costInfoEntity.setProcessDefinitionId(map.get("processDefinitionId"));
@@ -226,7 +226,7 @@ public class ApplyForCostServiceImpl implements ApplyForCostService {
         costInfoEntity.setProjectName(restsInfoVo.getProjectName());
         costInfoEntity.setPerformAmount(restsInfoVo.getTotalMoney());
         costInfoEntity.setHappenDate(restsInfoVo.getCreateDate());
-        costInfoEntity.setProposer(Long.valueOf(restsInfoVo.getCreateUser()));
+        costInfoEntity.setProposer(restsInfoVo.getCreateUser());
         costInfoEntity.setApplyCostId(save.getRestsId());
         costInfoEntity.setProcessInstanceId(map.get("processInstanceId"));
         costInfoEntity.setProcessDefinitionId(map.get("processDefinitionId"));
@@ -283,7 +283,7 @@ public class ApplyForCostServiceImpl implements ApplyForCostService {
         costInfoEntity.setRelevanceUser(userInfoEntity != null ? userInfoEntity.getShowName() : null);
         costInfoEntity.setProjectName(trafficExpenseVo.getProjectName());
         costInfoEntity.setPerformAmount(trafficExpenseVo.getTotalMoney());
-        costInfoEntity.setProposer(Long.valueOf(trafficExpenseVo.getApplicant()));
+        costInfoEntity.setProposer(trafficExpenseVo.getApplicant());
         costInfoEntity.setApplyCostId(save.getId());
         costInfoEntity.setProcessInstanceId(map.get("processInstanceId"));
         costInfoEntity.setProcessDefinitionId(map.get("processDefinitionId"));
@@ -340,7 +340,7 @@ public class ApplyForCostServiceImpl implements ApplyForCostService {
         costInfoEntity.setRelevanceUser(userInfoEntity != null ? userInfoEntity.getShowName() : null);
         costInfoEntity.setProjectName(repastExpenseVo.getProjectName());
         costInfoEntity.setPerformAmount(repastExpenseVo.getTotalMoney());
-        costInfoEntity.setProposer(Long.valueOf(repastExpenseVo.getApplicant()));
+        costInfoEntity.setProposer(repastExpenseVo.getApplicant());
         costInfoEntity.setApplyCostId(save.getId());
         costInfoEntity.setProcessInstanceId(map.get("processInstanceId"));
         costInfoEntity.setProcessDefinitionId(map.get("processDefinitionId"));
@@ -418,7 +418,7 @@ public class ApplyForCostServiceImpl implements ApplyForCostService {
         costInfoEntity.setRelevanceUser(userInfoEntity != null ? userInfoEntity.getShowName() : null);
         costInfoEntity.setProjectName(travelExpenseVo.getProjectName());
         costInfoEntity.setPerformAmount(travelExpenseVo.getTotalMoney());
-        costInfoEntity.setProposer(Long.valueOf(travelExpenseVo.getApplicant()));
+        costInfoEntity.setProposer(travelExpenseVo.getApplicant());
         costInfoEntity.setApplyCostId(save.getId());
         costInfoEntity.setProcessInstanceId(map.get("processInstanceId"));
         costInfoEntity.setProcessDefinitionId(map.get("processDefinitionId"));

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

@@ -90,7 +90,7 @@ public class CostInfoServiceImpl implements CostInfoService {
             return new ResMsg(CodeEnum.PARAM_IS_NULL);
         }
         costInfoEntity.setCostStatus(cost.getCostStatus() == null ? "1" : cost.getCostStatus());
-        costInfoEntity.setProposer(cost.getProposer() == null ? 1 : cost.getProposer());
+        costInfoEntity.setProposer(cost.getProposer() == null ? "1" : cost.getProposer());
         costInfoMapper.save(costInfoEntity);
         return new ResMsg(CodeEnum.OK);
     }
@@ -162,7 +162,7 @@ public class CostInfoServiceImpl implements CostInfoService {
     }
 
     @Override
-    public ResMsg findProjectAuditList(Long id, UserInfoVo userInfoVo) {
+    public ResMsg findProjectAuditList(String id, UserInfoVo userInfoVo) {
         Pageable page = PageRequest.of(userInfoVo.getPageIndex() - 1, userInfoVo.getPageSize());
         Page<Map<String, String>> byPrintcipalEquals = projectAuditInfoMapper.findByPrintcipalEquals(id, page);
         return new ResMsg(CodeEnum.OK, ResMsg.getMap(byPrintcipalEquals.map(map -> {

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

@@ -148,8 +148,8 @@ public class ProjectTeamServiceImpl implements ProjectTeamService {
     }
 
     @Override
-    public ResMsg findById(Long userId) {
-        UserInfoEntity byUserIdEquals = userInfoMapper.findByUserIdEquals(String.valueOf(userId));
+    public ResMsg findById(String userId) {
+        UserInfoEntity byUserIdEquals = userInfoMapper.findByUserIdEquals(userId);
         return new ResMsg(CodeEnum.OK, byUserIdEquals);
     }
 
@@ -225,7 +225,7 @@ public class ProjectTeamServiceImpl implements ProjectTeamService {
     }
 
     @Override
-    public ResMsg findUserProject(Long userId) {
+    public ResMsg findUserProject(String userId) {
         List<Integer> projectTeamIds = new ArrayList<>();
         List<String> byUserId = relevanceProjectInfoMapper.findByUserId(userId);
         for (String s : byUserId) {

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

@@ -155,7 +155,7 @@ public class FlowTaskStart {
         return ResponseResult.success(flowEntry);
     }
 
-    public ResponseResult<OnlineDatasource> verifyAndGetOnlineDatasource(Long formId) {
+    public ResponseResult<OnlineDatasource> verifyAndGetOnlineDatasource(String formId) {
         List<OnlineFormDatasource> formDatasourceList = onlineFormService.getFormDatasourceListFromCache(formId);
         if (CollUtil.isEmpty(formDatasourceList)) {
             String errorMessage = "数据验证失败，流程任务绑定的在线表单Id [" + formId + "] 不存在，请修改流程图！";

application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/api/SysUserApiService.java

@@ -46,7 +46,7 @@ public class SysUserApiService implements SysUserApi {
                     .collect(Collectors.toList());
             permCodeList = sysPermCodeService.getAllPermCodeList().stream().collect(Collectors.toList());
         } else {
-            allMenuList = sysMenuService.getMenuListByUserId(Long.parseLong(user.getUserId()))
+            allMenuList = sysMenuService.getMenuListByUserId(user.getUserId())
                     .stream()
                     .map(SysMenu::getMenuName)
                     .collect(Collectors.toList());;

application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/upms/bo/SysMenuPerm.java

@@ -18,12 +18,12 @@ public class SysMenuPerm {
     /**
      * 菜单Id。
      */
-    private Long menuId;
+    private String menuId;
 
     /**
      * 父菜单Id，目录菜单的父菜单为null
      */
-    private Long parentId;
+    private String parentId;
 
     /**
      * 菜单显示名称。
@@ -38,7 +38,7 @@ public class SysMenuPerm {
     /**
      * 在线表单主键Id，仅用于在线表单绑定的菜单。
      */
-    private Long onlineFormId;
+    private String onlineFormId;
 
     /**
      * 在线表单菜单的权限控制类型，具体值可参考SysOnlineMenuPermType常量对象。
@@ -48,12 +48,12 @@ public class SysMenuPerm {
     /**
      * 统计页面主键Id，仅用于统计页面绑定的菜单。
      */
-    private Long reportPageId;
+    private String reportPageId;
 
     /**
      * 仅用于在线表单的流程Id。
      */
-    private Long onlineFlowEntryId;
+    private String onlineFlowEntryId;
 
     /**
      * 关联权限URL集合。

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

@@ -61,7 +61,7 @@ public class GlobalDictController {
     @ApiOperationSupport(ignoreParameters = {"globalDictDto.dictId"})
     @OperationLog(type = SysOperationLogType.ADD)
     @PostMapping("/add")
-    public ResponseResult<Long> add(@MyRequestBody GlobalDictDto globalDictDto) {
+    public ResponseResult<String> add(@MyRequestBody GlobalDictDto globalDictDto) {
         String errorMessage = MyCommonUtil.getModelValidationError(globalDictDto);
         if (errorMessage != null) {
             return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
@@ -161,7 +161,7 @@ public class GlobalDictController {
     @ApiOperationSupport(ignoreParameters = {"globalDictItemDto.id"})
     @OperationLog(type = SysOperationLogType.ADD)
     @PostMapping("/addItem")
-    public ResponseResult<Long> addItem(@MyRequestBody GlobalDictItemDto globalDictItemDto) {
+    public ResponseResult<String> addItem(@MyRequestBody GlobalDictItemDto globalDictItemDto) {
         String errorMessage = MyCommonUtil.getModelValidationError(globalDictItemDto);
         if (errorMessage != null) {
             return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);

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

@@ -324,11 +324,11 @@ public class LoginController {
             allMenuList = sysMenuService.getAllListByOrder("showOrder");
             permCodeList = sysPermCodeService.getAllPermCodeList();
         } else {
-            allMenuList = sysMenuService.getMenuListByUserId(Long.parseLong(user.getUserId()));
+            allMenuList = sysMenuService.getMenuListByUserId(user.getUserId());
             permCodeList = sysPermCodeService.getPermCodeListByUserId(user.getUserId());
         }
-        List<SysMenu> menuList = allMenuList.stream()
-                .filter(m -> m.getMenuType() <= SysMenuType.TYPE_MENU).collect(Collectors.toList());
+        //List<SysMenu> menuList = allMenuList.stream()
+        //        .filter(m -> m.getMenuType() <= SysMenuType.TYPE_MENU).collect(Collectors.toList());
         //jsonData.put("menuList", menuList);
         //jsonData.put("permCodeList", permCodeList);
         Set<String> permSet = null;
@@ -360,7 +360,7 @@ public class LoginController {
     private TokenData buildTokenData(SysUser user, String sessionId, int deviceType) {
         TokenData tokenData = new TokenData();
         tokenData.setSessionId(sessionId);
-        tokenData.setUserId(Long.parseLong(user.getUserId()));
+        tokenData.setUserId(user.getUserId());
         tokenData.setDeptId(user.getDeptId());
         tokenData.setLoginName(user.getLoginName());
         tokenData.setShowName(user.getShowName());
@@ -416,7 +416,7 @@ public class LoginController {
         List<SysMenuPerm> allMenuPermList = MyModelUtil.copyCollectionTo(allMenuList, SysMenuPerm.class);
         allMenuPermList = allMenuPermList.stream()
                 .filter(m -> m.getMenuType() != SysMenuType.TYPE_DIRECTORY).collect(Collectors.toList());
-        Map<Long, SysMenuPerm> allMenuPermMap =
+        Map<String, SysMenuPerm> allMenuPermMap =
                 allMenuPermList.stream().collect(Collectors.toMap(SysMenuPerm::getMenuId, m -> m));
         List<Map<String, Object>> menuPermDataList = sysMenuService.getMenuAndPermListByRoleIds(roleIds);
         // 将查询出的菜单权限数据，挂接到完整的菜单树上。
@@ -426,12 +426,12 @@ public class LoginController {
             menuPerm.getPermUrlSet().add(menuPermData.get("url").toString());
         }
         // 根据菜单的上下级关联关系，将菜单列表还原为菜单树。
-        List<TreeNode<SysMenuPerm, Long>> menuTreeList =
+        List<TreeNode<SysMenuPerm, String>> menuTreeList =
                 TreeNode.build(allMenuPermList, SysMenuPerm::getMenuId, SysMenuPerm::getParentId, null);
         Set<String> permSet = new HashSet<>();
         String sessionId = TokenData.takeFromRequest().getSessionId();
         // 递归菜单树上每个菜单节点，将子菜单关联的所有permUrlSet，都合并到一级菜单的permUrlSet中。
-        for (TreeNode<SysMenuPerm, Long> treeNode : menuTreeList) {
+        for (TreeNode<SysMenuPerm, String> treeNode : menuTreeList) {
             this.buildAllSubMenuPermUrlSet(treeNode.getChildList(), treeNode.getData().getPermUrlSet());
             permSet.addAll(treeNode.getData().getPermUrlSet());
             this.putMenuPermToCache(sessionId, treeNode.getData());
@@ -439,8 +439,8 @@ public class LoginController {
         return permSet;
     }
 
-    private void buildAllSubMenuPermUrlSet(List<TreeNode<SysMenuPerm, Long>> subList, Set<String> rootPermUrlSet) {
-        for (TreeNode<SysMenuPerm, Long> treeNode : subList) {
+    private void buildAllSubMenuPermUrlSet(List<TreeNode<SysMenuPerm, String>> subList, Set<String> rootPermUrlSet) {
+        for (TreeNode<SysMenuPerm, String> treeNode : subList) {
             rootPermUrlSet.addAll(treeNode.getData().getPermUrlSet());
             if (CollUtil.isNotEmpty(treeNode.getChildList())) {
                 this.buildAllSubMenuPermUrlSet(treeNode.getChildList(), rootPermUrlSet);
@@ -459,7 +459,7 @@ public class LoginController {
                         && m.getOnlineFlowEntryId() == null
                         && m.getMenuType().equals(SysMenuType.TYPE_MENU))
                 .collect(Collectors.toList());
-        Map<Long, List<SysMenuPerm>> onlineMenuPermMap =
+        Map<String, List<SysMenuPerm>> onlineMenuPermMap =
                 onlineMenuPermList.stream().collect(Collectors.groupingBy(SysMenuPerm::getOnlineFormId));
         this.buildOnlinePermData(onlineMenuList, onlineMenuPermMap, permData);
         // 这个非常非常重要，不能删除。因为在线票单的url前缀是可以配置的，那么表单字典接口的url也是动态。
@@ -478,12 +478,12 @@ public class LoginController {
     }
 
     private void buildOnlinePermData(
-            List<SysMenu> onlineMenuList, Map<Long, List<SysMenuPerm>> onlineMenuPermMap, OnlinePermData permData) {
+            List<SysMenu> onlineMenuList, Map<String, List<SysMenuPerm>> onlineMenuPermMap, OnlinePermData permData) {
         List<SysMenu> viewMenuList = onlineMenuList.stream()
                 .filter(m -> m.getOnlineMenuPermType() == SysOnlineMenuPermType.TYPE_VIEW)
                 .collect(Collectors.toList());
         if (CollUtil.isNotEmpty(viewMenuList)) {
-            Set<Long> formIdSet = viewMenuList.stream().map(SysMenu::getOnlineFormId).collect(Collectors.toSet());
+            Set<String> formIdSet = viewMenuList.stream().map(SysMenu::getOnlineFormId).collect(Collectors.toSet());
             List<OnlineDatasource> datasourceList =
                     onlineDatasourceService.getOnlineDatasourceListByFormIds(formIdSet);
             for (OnlineDatasource datasource : datasourceList) {
@@ -501,7 +501,7 @@ public class LoginController {
                 .filter(m -> m.getOnlineMenuPermType() == SysOnlineMenuPermType.TYPE_EDIT)
                 .collect(Collectors.toList());
         if (CollUtil.isNotEmpty(editMenuList)) {
-            Set<Long> formIdSet = editMenuList.stream().map(SysMenu::getOnlineFormId).collect(Collectors.toSet());
+            Set<String> formIdSet = editMenuList.stream().map(SysMenu::getOnlineFormId).collect(Collectors.toSet());
             List<OnlineDatasource> datasourceList =
                     onlineDatasourceService.getOnlineDatasourceListByFormIds(formIdSet);
             for (OnlineDatasource datasource : datasourceList) {

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

@@ -53,7 +53,7 @@ public class SysDeptController {
     @ApiOperationSupport(ignoreParameters = {"sysDeptDto.deptId"})
     @OperationLog(type = SysOperationLogType.ADD)
     @PostMapping("/add")
-    public ResponseResult<String> add(@MyRequestBody SysDeptDto sysDeptDto) {
+    public ResponseResult<String> add(@RequestBody SysDeptDto sysDeptDto) {
         String errorMessage = MyCommonUtil.getModelValidationError(sysDeptDto, false);
         if (errorMessage != null) {
             return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
@@ -69,7 +69,7 @@ public class SysDeptController {
             }
         }
         sysDept = sysDeptService.saveNew(sysDept, parentSysDept);
-        return ResponseResult.success(sysDept.getDeptId());
+        return ResponseResult.success(sysDept.getDeptId() + "");
     }
 
     /**
@@ -116,7 +116,7 @@ public class SysDeptController {
      */
     @OperationLog(type = SysOperationLogType.DELETE)
     @PostMapping("/delete")
-    public ResponseResult<Void> delete(@MyRequestBody String deptId) {
+    public ResponseResult<Void> delete(@MyRequestBody Long deptId) {
         if (MyCommonUtil.existBlankArgument(deptId)) {
             return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
         }
@@ -202,11 +202,11 @@ public class SysDeptController {
      * @return 应答结果对象，包含对象详情。
      */
     @GetMapping("/view")
-    public ResponseResult<SysDeptVo> view(@RequestParam Long deptId) {
+    public ResponseResult<SysDeptVo> view(@RequestParam String deptId) {
         if (MyCommonUtil.existBlankArgument(deptId)) {
             return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
         }
-        SysDept sysDept = sysDeptService.getByIdWithRelation(deptId, MyRelationParam.full());
+        SysDept sysDept = sysDeptService.getByIdWithRelation(Long.valueOf(deptId), MyRelationParam.full());
         if (sysDept == null) {
             return ResponseResult.error(ErrorCodeEnum.DATA_NOT_EXIST);
         }
@@ -236,12 +236,12 @@ public class SysDeptController {
             PageMethod.startPage(pageParam.getPageNum(), pageParam.getPageSize());
         }
         SysPost filter = MyModelUtil.copyTo(sysPostDtoFilter, SysPost.class);
-        String orderBy = MyOrderParam.buildOrderBy(orderParam, SysPost.class);
+        //String orderBy = MyOrderParam.buildOrderBy(orderParam, SysPost.class);
         List<SysPost> sysPostList;
         if (MyCommonUtil.isNotBlankOrNull(deptId)) {
-            sysPostList = sysPostService.getNotInSysPostListByDeptId(deptId, filter, orderBy);
+            sysPostList = sysPostService.getNotInSysPostListByDeptId(deptId, filter);
         } else {
-            sysPostList = sysPostService.getSysPostList(filter, orderBy);
+            sysPostList = sysPostService.getSysPostList(filter);
             sysPostService.buildRelationForDataList(sysPostList, MyRelationParam.dictOnly());
         }
         return ResponseResult.success(MyPageUtil.makeResponseData(sysPostList, SysPost.INSTANCE));
@@ -283,7 +283,7 @@ public class SysDeptController {
      */
     @PostMapping("/addSysDeptPost")
     public ResponseResult<Void> addSysDeptPost(
-            @MyRequestBody String deptId,
+            @MyRequestBody Long deptId,
             @MyRequestBody List<SysDeptPostDto> sysDeptPostDtoList) {
         if (MyCommonUtil.existBlankArgument(deptId, sysDeptPostDtoList)) {
             return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
@@ -292,8 +292,8 @@ public class SysDeptController {
         if (errorMessage != null) {
             return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
         }
-        Set<Long> postIdSet = sysDeptPostDtoList.stream().map(SysDeptPostDto::getPostId).collect(Collectors.toSet());
-        if (!sysDeptService.existId(Long.valueOf(deptId)) || !sysPostService.existUniqueKeyList("postId", postIdSet)) {
+        Set<String> postIdSet = sysDeptPostDtoList.stream().map(SysDeptPostDto::getPostId).collect(Collectors.toSet());
+        if (!sysDeptService.existId(deptId) || !sysPostService.existUniqueKeyList("postId", postIdSet)) {
             return ResponseResult.error(ErrorCodeEnum.INVALID_RELATED_RECORD_ID);
         }
         List<SysDeptPost> sysDeptPostList = MyModelUtil.copyCollectionTo(sysDeptPostDtoList, SysDeptPost.class);
@@ -328,7 +328,7 @@ public class SysDeptController {
      * @return 应答结果对象，包括中间表详情。
      */
     @GetMapping("/viewSysDeptPost")
-    public ResponseResult<SysDeptPostVo> viewSysDeptPost(@RequestParam String deptId, @RequestParam String postId) {
+    public ResponseResult<SysDeptPostVo> viewSysDeptPost(@RequestParam Long deptId, @RequestParam Long postId) {
         if (MyCommonUtil.existBlankArgument(deptId, postId)) {
             return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
         }
@@ -348,7 +348,7 @@ public class SysDeptController {
      * @return 应答结果对象。
      */
     @PostMapping("/deleteSysDeptPost")
-    public ResponseResult<Void> deleteSysDeptPost(@MyRequestBody String deptId, @MyRequestBody String postId) {
+    public ResponseResult<Void> deleteSysDeptPost(@MyRequestBody Long deptId, @MyRequestBody Long postId) {
         if (MyCommonUtil.existBlankArgument(deptId, postId)) {
             return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
         }
@@ -380,8 +380,8 @@ public class SysDeptController {
     @GetMapping("/listDict")
     public ResMsg listDict(SysDept filter) {
         List<SysDept> resultList = sysDeptService.getListByFilter(filter);
-        return ResMsg.newInstance(CodeEnum.OK, BeanQuery.select(
-                "parentId as parentId", "deptId as id", "deptName as name").executeFrom(resultList));
+        List<Map<String, Object>> mapList = BeanQuery.select("parentId as parentId", "deptId as id", "deptName as name").executeFrom(resultList);
+        return ResMsg.newInstance(CodeEnum.OK, sysDeptService.lossOfAccuracy(mapList));
     }
 
     /**
@@ -391,10 +391,10 @@ public class SysDeptController {
      * @return 应答结果对象，包含字典形式的数据集合。
      */
     @PostMapping("/listDictByIds")
-    public ResponseResult<List<Map<String, Object>>> listDictByIds(@MyRequestBody List<Long> dictIds) {
+    public ResponseResult<List<Map<String, String>>> listDictByIds(@MyRequestBody List<Long> dictIds) {
         List<SysDept> resultList = sysDeptService.getInList(new HashSet<>(dictIds));
-        return ResponseResult.success(BeanQuery.select(
-                "parentId as parentId", "deptId as id", "deptName as name").executeFrom(resultList));
+        List<Map<String, Object>> mapList = BeanQuery.select("parentId as parentId", "deptId as id", "deptName as name").executeFrom(resultList);
+        return ResponseResult.success(sysDeptService.lossOfAccuracy(mapList));
     }
 
     /**
@@ -405,12 +405,13 @@ public class SysDeptController {
      * @return 按照字典的形式返回下级数据列表。
      */
     @GetMapping("/listDictByParentId")
-    public ResponseResult<List<Map<String, Object>>> listDictByParentId(@RequestParam(required = false) Long parentId) {
+    public ResponseResult<List<Map<String, String>>> listDictByParentId(@RequestParam(required = false) Long parentId) {
         List<SysDept> resultList = sysDeptService.getListByParentId("parentId", parentId);
-        return ResponseResult.success(BeanQuery.select(
-                "parentId as parentId", "deptId as id", "deptName as name").executeFrom(resultList));
+        List<Map<String, Object>> mapList = BeanQuery.select("parentId as parentId", "deptId as id", "deptName as name").executeFrom(resultList);
+        return ResponseResult.success(sysDeptService.lossOfAccuracy(mapList));
     }
 
+
     /**
      * 根据父主键Id列表，获取当前部门Id及其所有下级部门Id列表。
      * 白名单接口，登录用户均可访问。
@@ -426,7 +427,7 @@ public class SysDeptController {
         return ResponseResult.success(sysDeptService.getAllChildDeptIdByParentIds(parentIdList));
     }
 
-    private ResponseResult<Void> doDelete(String deptId) {
+    private ResponseResult<Void> doDelete(Long deptId) {
         String errorMessage;
         // 验证关联Id的数据合法性
         SysDept originalSysDept = sysDeptService.getById(deptId);

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

@@ -55,7 +55,7 @@ public class SysMenuController {
     @ApiOperationSupport(ignoreParameters = {"sysMenuDto.menuId"})
     @OperationLog(type = SysOperationLogType.ADD)
     @PostMapping("/add")
-    public ResponseResult<Long> add(
+    public ResponseResult<String> add(
             @MyRequestBody SysMenuDto sysMenuDto, @MyRequestBody String permCodeIdListString) {
         String errorMessage = MyCommonUtil.getModelValidationError(sysMenuDto);
         if (errorMessage != null) {
@@ -77,9 +77,9 @@ public class SysMenuController {
         if (!result.isSuccess()) {
             return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, result.getErrorMessage());
         }
-        Set<Long> permCodeIdSet = null;
+        Set<String> permCodeIdSet = null;
         if (result.getData() != null) {
-            permCodeIdSet = result.getData().getObject("permCodeIdSet", new TypeReference<Set<Long>>() {
+            permCodeIdSet = result.getData().getObject("permCodeIdSet", new TypeReference<Set<String>>() {
             });
         }
         sysMenuService.saveNew(sysMenu, permCodeIdSet);
@@ -126,9 +126,9 @@ public class SysMenuController {
         if (!result.isSuccess()) {
             return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, result.getErrorMessage());
         }
-        Set<Long> permCodeIdSet = null;
+        Set<String> permCodeIdSet = null;
         if (result.getData() != null) {
-            permCodeIdSet = result.getData().getObject("permCodeIdSet", new TypeReference<Set<Long>>() {
+            permCodeIdSet = result.getData().getObject("permCodeIdSet", new TypeReference<Set<String>>() {
             });
         }
         if (!sysMenuService.update(sysMenu, originalSysMenu, permCodeIdSet)) {
@@ -160,7 +160,7 @@ public class SysMenuController {
             return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
         }
         // 对于在线表单，无需进行子菜单的验证，而是在删除的时候，连同子菜单一起删除。
-        if (menu.getOnlineFormId() == null && sysMenuService.hasChildren(menuId)) {
+        if (menu.getOnlineFormId() == null && sysMenuService.hasChildren(menuId + "")) {
             errorMessage = "数据验证失败，当前菜单存在下级菜单！";
             return ResponseResult.error(ErrorCodeEnum.HAS_CHILDREN_DATA, errorMessage);
         }

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

@@ -47,7 +47,7 @@ public class SysPermCodeController {
     @ApiOperationSupport(ignoreParameters = {"sysPermCodeDto.permCodeId"})
     @OperationLog(type = SysOperationLogType.ADD)
     @PostMapping("/add")
-    public ResponseResult<Long> add(
+    public ResponseResult<String> add(
             @MyRequestBody SysPermCodeDto sysPermCodeDto, @MyRequestBody String permIdListString) {
         String errorMessage = MyCommonUtil.getModelValidationError(sysPermCodeDto);
         if (errorMessage != null) {
@@ -58,9 +58,9 @@ public class SysPermCodeController {
         if (!result.isSuccess()) {
             return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, result.getErrorMessage());
         }
-        Set<Long> permIdSet = null;
+        Set<String> permIdSet = null;
         if (result.getData() != null) {
-            permIdSet = result.getData().getObject("permIdSet", new TypeReference<Set<Long>>() {
+            permIdSet = result.getData().getObject("permIdSet", new TypeReference<Set<String>>() {
             });
         }
         sysPermCode = sysPermCodeService.saveNew(sysPermCode, permIdSet);
@@ -92,9 +92,9 @@ public class SysPermCodeController {
         if (!result.isSuccess()) {
             return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, result.getErrorMessage());
         }
-        Set<Long> permIdSet = null;
+        Set<String> permIdSet = null;
         if (result.getData() != null) {
-            permIdSet = result.getData().getObject("permIdSet", new TypeReference<Set<Long>>() {
+            permIdSet = result.getData().getObject("permIdSet", new TypeReference<Set<String>>() {
             });
         }
         try {
@@ -122,11 +122,11 @@ public class SysPermCodeController {
             return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
         }
         String errorMessage;
-        if (sysPermCodeService.hasChildren(permCodeId)) {
+        if (sysPermCodeService.hasChildren(permCodeId + "")) {
             errorMessage = "数据验证失败，当前权限字存在下级权限字！";
             return ResponseResult.error(ErrorCodeEnum.HAS_CHILDREN_DATA, errorMessage);
         }
-        if (!sysPermCodeService.remove(permCodeId)) {
+        if (!sysPermCodeService.remove(permCodeId + "")) {
             errorMessage = "数据操作失败，权限字不存在，请刷新后重试！";
             return ResponseResult.error(ErrorCodeEnum.DATA_NOT_EXIST, errorMessage);
         }

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

@@ -47,7 +47,7 @@ public class SysPermController {
     @ApiOperationSupport(ignoreParameters = {"sysPermDto.permId"})
     @OperationLog(type = SysOperationLogType.ADD)
     @PostMapping("/add")
-    public ResponseResult<Long> add(@MyRequestBody SysPermDto sysPermDto) {
+    public ResponseResult<String> add(@MyRequestBody SysPermDto sysPermDto) {
         String errorMessage = MyCommonUtil.getModelValidationError(sysPermDto);
         if (errorMessage != null) {
             return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
@@ -100,7 +100,7 @@ public class SysPermController {
         if (MyCommonUtil.existBlankArgument(permId)) {
             return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
         }
-        if (!sysPermService.remove(permId)) {
+        if (!sysPermService.remove(permId + "")) {
             String errorMessage = "数据操作失败，权限不存在，请刷新后重试！";
             return ResponseResult.error(ErrorCodeEnum.DATA_NOT_EXIST, errorMessage);
         }

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

@@ -49,7 +49,7 @@ public class SysPermModuleController {
     @ApiOperationSupport(ignoreParameters = {"sysPermModuleDto.moduleId"})
     @OperationLog(type = SysOperationLogType.ADD)
     @PostMapping("/add")
-    public ResponseResult<Long> add(@MyRequestBody SysPermModuleDto sysPermModuleDto) {
+    public ResponseResult<String> add(@MyRequestBody SysPermModuleDto sysPermModuleDto) {
         String errorMessage = MyCommonUtil.getModelValidationError(sysPermModuleDto);
         if (errorMessage != null) {
             return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
@@ -109,8 +109,8 @@ public class SysPermModuleController {
             return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
         }
         String errorMessage;
-        if (sysPermModuleService.hasChildren(moduleId)
-                || sysPermModuleService.hasModulePerms(moduleId)) {
+        if (sysPermModuleService.hasChildren(moduleId + "")
+                || sysPermModuleService.hasModulePerms(moduleId + "")) {
             errorMessage = "数据验证失败，当前权限模块存在子模块或权限资源，请先删除关联数据！";
             return ResponseResult.error(ErrorCodeEnum.HAS_CHILDREN_DATA, errorMessage);
         }

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

@@ -1,5 +1,8 @@
 package com.ankaibei.workFlow.webadmin.upms.controller;
 
+import com.alibaba.fastjson.JSON;
+import com.ankaibei.workFlow.webadmin.upms.service.SysDeptService;
+import com.ankaibei.workFlow.webadmin.upms.vo.SysPostReposVo;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.Api;
 import cn.jimmyshi.beanquery.BeanQuery;
@@ -36,6 +39,8 @@ public class SysPostController {
 
     @Autowired
     private SysPostService sysPostService;
+    @Autowired
+    private SysDeptService sysDeptService;
 
     /**
      * 新增岗位管理数据。
@@ -46,7 +51,7 @@ public class SysPostController {
     @ApiOperationSupport(ignoreParameters = {"sysPostDto.postId"})
     @OperationLog(type = SysOperationLogType.ADD)
     @PostMapping("/add")
-    public ResponseResult<Long> add(@MyRequestBody SysPostDto sysPostDto) {
+    public ResponseResult<String> add(@RequestBody SysPostDto sysPostDto) {
         String errorMessage = MyCommonUtil.getModelValidationError(sysPostDto);
         if (errorMessage != null) {
             return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
@@ -64,7 +69,7 @@ public class SysPostController {
      */
     @OperationLog(type = SysOperationLogType.UPDATE)
     @PostMapping("/update")
-    public ResponseResult<Void> update(@MyRequestBody SysPostDto sysPostDto) {
+    public ResponseResult<Void> update(@RequestBody SysPostDto sysPostDto) {
         String errorMessage = MyCommonUtil.getModelValidationError(sysPostDto, Default.class, UpdateGroup.class);
         if (errorMessage != null) {
             return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
@@ -90,7 +95,7 @@ public class SysPostController {
      */
     @OperationLog(type = SysOperationLogType.DELETE)
     @PostMapping("/delete")
-    public ResponseResult<Void> delete(@MyRequestBody String postId) {
+    public ResponseResult<Void> delete(@MyRequestBody Long postId) {
         String errorMessage;
         if (MyCommonUtil.existBlankArgument(postId)) {
             return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
@@ -113,21 +118,16 @@ public class SysPostController {
      * 列出符合过滤条件的岗位管理列表。
      *
      * @param sysPostDtoFilter 过滤对象。
-     * @param orderParam       排序参数。
-     * @param pageParam        分页参数。
      * @return 应答结果对象，包含查询结果集。
      */
     @PostMapping("/list")
     public ResponseResult<MyPageData<SysPostVo>> list(
-            @MyRequestBody SysPostDto sysPostDtoFilter,
-            @MyRequestBody MyOrderParam orderParam,
-            @MyRequestBody MyPageParam pageParam) {
-        if (pageParam != null) {
-            PageMethod.startPage(pageParam.getPageNum(), pageParam.getPageSize());
+            @RequestBody SysPostDto sysPostDtoFilter) {
+        if (sysPostDtoFilter.getPageNum() != null) {
+            PageMethod.startPage(sysPostDtoFilter.getPageNum(), sysPostDtoFilter.getPageSize());
         }
         SysPost sysPostFilter = MyModelUtil.copyTo(sysPostDtoFilter, SysPost.class);
-        String orderBy = MyOrderParam.buildOrderBy(orderParam, SysPost.class);
-        List<SysPost> sysPostList = sysPostService.getSysPostListWithRelation(sysPostFilter, orderBy);
+        List<SysPost> sysPostList = sysPostService.getSysPostListWithRelation(sysPostFilter);
         return ResponseResult.success(MyPageUtil.makeResponseData(sysPostList, SysPost.INSTANCE));
     }
 
@@ -157,10 +157,12 @@ public class SysPostController {
      * @param filter 过滤对象。
      * @return 应答结果对象，包含的数据为 List<Map<String, String>>，map中包含两条记录，key的值分别是id和name，value对应具体数据。
      */
-    @GetMapping("/listDict")
-    public ResponseResult<List<Map<String, Object>>> listDict(SysPost filter) {
+    @PostMapping("/listDict")
+    public ResponseResult listDict(SysPost filter) {
         List<SysPost> resultList = sysPostService.getListByFilter(filter);
-        return ResponseResult.success(BeanQuery.select("postId as id", "postName as name").executeFrom(resultList));
+        List<Map<String, Object>> mapList = BeanQuery.select("postId as id", "postName as name").executeFrom(resultList);
+        List<SysPostReposVo> workSysUserVoList = JSON.parseArray(JSON.toJSONString(mapList), SysPostReposVo.class);
+        return ResponseResult.success(workSysUserVoList);
     }
 
     /**
@@ -170,8 +172,9 @@ public class SysPostController {
      * @return 应答结果对象，包含字典形式的数据集合。
      */
     @PostMapping("/listDictByIds")
-    public ResponseResult<List<Map<String, Object>>> listDictByIds(@MyRequestBody List<Long> postIds) {
+    public ResponseResult<List<Map<String, String>>> listDictByIds(@RequestBody List<Long> postIds) {
         List<SysPost> resultList = sysPostService.getInList(new HashSet<>(postIds));
-        return ResponseResult.success(BeanQuery.select("postId as id", "postName as name").executeFrom(resultList));
+        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/SysUserController.java

@@ -65,7 +65,7 @@ public class SysUserController {
             "sysUserDto.createTimeEnd"})
     @OperationLog(type = SysOperationLogType.ADD)
     @PostMapping("/add")
-    public ResponseResult<Long> add(@RequestBody SysUserDto sysUserDto) {
+    public ResponseResult<String> add(@RequestBody SysUserDto sysUserDto) {
 
         //角色是查看全部，前台已取消对角色的控制   这里直接写死
         String roleIdListString = "1575681957692444672";
@@ -92,7 +92,7 @@ public class SysUserController {
         Set<Long> dataPermIdSet = result.getData().getObject("dataPermIdSet", new TypeReference<Set<Long>>() {});
         sysUser.setUserType(1);
         sysUserService.saveNew(sysUser, roleIdSet, deptPostIdSet, dataPermIdSet);
-        return ResponseResult.success(Long.parseLong(sysUser.getUserId()));
+        return ResponseResult.success(sysUser.getUserId());
     }
 
     /**
@@ -154,7 +154,7 @@ public class SysUserController {
         if (MyCommonUtil.existBlankArgument(userId)) {
             return ResMsg.error(CodeEnum.ARGUMENT_NULL_EXIST.getCode(), CodeEnum.ARGUMENT_NULL_EXIST.toString());
         }
-        if (!sysUserService.changePassword(userId, appConfig.getDefaultUserPassword())) {
+        if (!sysUserService.changePassword(userId + "", appConfig.getDefaultUserPassword())) {
             return ResMsg.error(CodeEnum.DATA_NOT_EXIST.getCode(), CodeEnum.DATA_NOT_EXIST.toString());
         }
         return new ResMsg(CodeEnum.OK);
@@ -168,8 +168,7 @@ public class SysUserController {
      */
     @OperationLog(type = SysOperationLogType.DELETE)
     @PostMapping("/delete")
-    public ResponseResult<Void> delete(@MyRequestBody String userId) {
-        String errorMessage;
+    public ResponseResult<Void> delete(@MyRequestBody Long userId) {
         if (MyCommonUtil.existBlankArgument(userId)) {
             return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
         }
@@ -353,7 +352,7 @@ public class SysUserController {
         return ResponseResult.success(sysUserService.getSysMenuListWithDetail(userId, menuName));
     }
 
-    private ResponseResult<Void> doDelete(String userId) {
+    private ResponseResult<Void> doDelete(Long userId) {
         String errorMessage;
         // 验证关联Id的数据合法性
         SysUser originalSysUser = sysUserService.getById(userId);
@@ -362,7 +361,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/SysMenuMapper.java

@@ -20,7 +20,7 @@ public interface SysMenuMapper extends BaseDaoMapper<SysMenu> {
      * @param userId 登录用户。
      * @return 菜单列表。
      */
-    List<SysMenu> getMenuListByUserId(@Param("userId") Long userId);
+    List<SysMenu> getMenuListByUserId(@Param("userId") String userId);
 
     /**
      * 获取当前用户有权访问的在线表单菜单。

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

@@ -18,11 +18,10 @@ public interface SysPostMapper extends BaseDaoMapper<SysPost> {
      * 获取过滤后的对象列表。
      *
      * @param sysPostFilter 主表过滤对象。
-     * @param orderBy       排序字符串，order by从句的参数。
      * @return 对象列表。
      */
     List<SysPost> getSysPostList(
-            @Param("sysPostFilter") SysPost sysPostFilter, @Param("orderBy") String orderBy);
+            @Param("sysPostFilter") SysPost sysPostFilter);
 
     /**
      * 获取指定部门的岗位列表。
@@ -42,11 +41,9 @@ public interface SysPostMapper extends BaseDaoMapper<SysPost> {
      *
      * @param deptId        关联主表Id。
      * @param sysPostFilter 过滤对象。
-     * @param orderBy       排序字符串，order by从句的参数。
      * @return 与主表没有建立关联的从表数据列表。
      */
     List<SysPost> getNotInSysPostListByDeptId(
             @Param("deptId") Long deptId,
-            @Param("sysPostFilter") SysPost sysPostFilter,
-            @Param("orderBy") String orderBy);
+            @Param("sysPostFilter") SysPost sysPostFilter);
 }

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

@@ -44,9 +44,6 @@
         <where>
             <include refid="filterRef"/>
         </where>
-        <if test="orderBy != null and orderBy != ''">
-            ORDER BY ${orderBy}
-        </if>
     </select>
 
     <select id="getSysPostListByDeptId" resultMap="BaseResultMapWithSysDeptPost">
@@ -76,8 +73,5 @@
             WHERE work_sys_dept_post.dept_id = #{deptId} AND work_sys_dept_post.post_id = work_sys_post.post_id)
             <include refid="filterRef"/>
         </where>
-        <if test="orderBy != null and orderBy != ''">
-            ORDER BY ${orderBy}
-        </if>
     </select>
 </mapper>

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

@@ -18,11 +18,11 @@ public class SysDataPermDeptDto {
      * 数据权限Id。
      */
     @ApiModelProperty(value = "数据权限Id", required = true)
-    private Long dataPermId;
+    private String dataPermId;
 
     /**
      * 关联部门Id。
      */
     @ApiModelProperty(value = "关联部门Id", required = true)
-    private Long deptId;
+    private String deptId;
 }

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

@@ -25,7 +25,7 @@ public class SysDataPermDto {
      */
     @ApiModelProperty(value = "数据权限Id", required = true)
     @NotNull(message = "数据权限Id不能为空！", groups = {UpdateGroup.class})
-    private Long dataPermId;
+    private String dataPermId;
 
     /**
      * 显示名称。

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

@@ -18,11 +18,11 @@ public class SysDataPermMenuDto {
      * 数据权限Id。
      */
     @ApiModelProperty(value = "数据权限Id", required = true)
-    private Long dataPermId;
+    private String dataPermId;
 
     /**
      * 关联菜单Id。
      */
     @ApiModelProperty(value = "关联菜单Id", required = true)
-    private Long menuId;
+    private String menuId;
 }

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

@@ -28,7 +28,7 @@ public class SysDeptDto extends MyPageParam {
      */
     @ApiModelProperty(value = "部门Id", required = true)
     @NotNull(message = "数据验证失败，部门Id不能为空！", groups = {UpdateGroup.class})
-    private Long deptId;
+    private String deptId;
 
     /**
      * 部门名称。
@@ -48,19 +48,19 @@ public class SysDeptDto extends MyPageParam {
      * 父部门Id。
      */
     @ApiModelProperty(value = "父部门Id")
-    private Long parentId;
+    private String parentId;
 
     /**
      * 创建者Id。
      */
     @ApiModelProperty(value = "创建者Id")
-    private Long createUserId;
+    private String createUserId;
 
     /**
      * 更新者Id。
      */
     @ApiModelProperty(value = "更新者Id")
-    private Long updateUserId;
+    private String updateUserId;
 
     /**
      * 创建时间。

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

@@ -23,21 +23,21 @@ public class SysDeptPostDto {
      */
     @ApiModelProperty(value = "部门岗位Id", required = true)
     @NotNull(message = "数据验证失败，部门岗位Id不能为空！", groups = {UpdateGroup.class})
-    private Long deptPostId;
+    private String deptPostId;
 
     /**
      * 部门Id。
      */
     @ApiModelProperty(value = "部门Id", required = true)
     @NotNull(message = "数据验证失败，部门Id不能为空！", groups = {UpdateGroup.class})
-    private Long deptId;
+    private String deptId;
 
     /**
      * 岗位Id。
      */
     @ApiModelProperty(value = "岗位Id", required = true)
     @NotNull(message = "数据验证失败，岗位Id不能为空！", groups = {UpdateGroup.class})
-    private Long postId;
+    private String postId;
 
     /**
      * 部门岗位显示名称。

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

@@ -25,13 +25,13 @@ public class SysMenuDto {
      */
     @ApiModelProperty(value = "菜单Id", required = true)
     @NotNull(message = "菜单Id不能为空！", groups = {UpdateGroup.class})
-    private Long menuId;
+    private String menuId;
 
     /**
      * 父菜单Id，目录菜单的父菜单为null
      */
     @ApiModelProperty(value = "父菜单Id")
-    private Long parentId;
+    private String parentId;
 
     /**
      * 菜单显示名称。
@@ -58,19 +58,19 @@ public class SysMenuDto {
      * 在线表单主键Id，仅用于在线表单绑定的菜单。
      */
     @ApiModelProperty(value = "在线表单主键Id")
-    private Long onlineFormId;
+    private String onlineFormId;
 
     /**
      * 统计页面主键Id，仅用于统计页面绑定的菜单。
      */
     @ApiModelProperty(value = "统计页面主键Id")
-    private Long reportPageId;
+    private String reportPageId;
 
     /**
      * 仅用于在线表单的流程Id。
      */
     @ApiModelProperty(value = "仅用于在线表单的流程Id")
-    private Long onlineFlowEntryId;
+    private String onlineFlowEntryId;
 
     /**
      * 菜单显示顺序 (值越小，排序越靠前)。

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

@@ -25,7 +25,7 @@ public class SysPermCodeDto {
      */
     @ApiModelProperty(value = "权限字Id", required = true)
     @NotNull(message = "权限字Id不能为空！", groups = {UpdateGroup.class})
-    private Long permCodeId;
+    private String permCodeId;
 
     /**
      * 权限字标识(一般为有含义的英文字符串)。
@@ -38,7 +38,7 @@ public class SysPermCodeDto {
      * 上级权限字Id。
      */
     @ApiModelProperty(value = "上级权限字Id")
-    private Long parentId;
+    private String parentId;
 
     /**
      * 权限字类型(0: 表单 1: UI片段 2: 操作)。

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

@@ -23,7 +23,7 @@ public class SysPermDto {
      */
     @ApiModelProperty(value = "权限资源Id", required = true)
     @NotNull(message = "权限Id不能为空！", groups = {UpdateGroup.class})
-    private Long permId;
+    private String permId;
 
     /**
      * 权限资源名称。
@@ -43,7 +43,7 @@ public class SysPermDto {
      */
     @ApiModelProperty(value = "权限所在的权限模块Id")
     @NotNull(message = "权限模块Id不能为空！")
-    private Long moduleId;
+    private String moduleId;
 
     /**
      * 关联的URL。

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

@@ -25,7 +25,7 @@ public class SysPermModuleDto {
      */
     @ApiModelProperty(value = "权限模块Id", required = true)
     @NotNull(message = "权限模块Id不能为空！", groups = {UpdateGroup.class})
-    private Long moduleId;
+    private String moduleId;
 
     /**
      * 权限模块名称。
@@ -38,7 +38,7 @@ public class SysPermModuleDto {
      * 上级权限模块Id。
      */
     @ApiModelProperty(value = "上级权限模块Id")
-    private Long parentId;
+    private String parentId;
 
     /**
      * 权限模块类型(0: 普通模块 1: Controller模块)。

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

@@ -1,5 +1,6 @@
 package com.ankaibei.workFlow.webadmin.upms.dto;
 
+import com.ankaibei.workFlow.common.core.object.MyPageParam;
 import com.ankaibei.workFlow.common.core.validator.UpdateGroup;
 
 import io.swagger.annotations.ApiModel;
@@ -16,14 +17,14 @@ import javax.validation.constraints.*;
  */
 @ApiModel("岗位Dto")
 @Data
-public class SysPostDto {
+public class SysPostDto extends MyPageParam {
 
     /**
      * 岗位Id。
      */
     @ApiModelProperty(value = "岗位Id", required = true)
     @NotNull(message = "数据验证失败，岗位Id不能为空！", groups = {UpdateGroup.class})
-    private Long postId;
+    private String postId;
 
     /**
      * 岗位名称。

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

@@ -22,7 +22,7 @@ public class SysRoleDto {
      */
     @ApiModelProperty(value = "角色Id", required = true)
     @NotNull(message = "角色Id不能为空！", groups = {UpdateGroup.class})
-    private Long roleId;
+    private String roleId;
 
     /**
      * 角色名称。

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

@@ -30,7 +30,7 @@ public class SysUserDto extends MyPageParam {
      */
     @ApiModelProperty(value = "用户Id", required = true)
     @NotNull(message = "数据验证失败，用户Id不能为空！", groups = {UpdateGroup.class})
-    private Long userId;
+    private String userId;
 
     /**
      * 登录用户名。
@@ -58,7 +58,7 @@ public class SysUserDto extends MyPageParam {
      */
     @ApiModelProperty(value = "用户部门Id", required = true)
     @NotNull(message = "数据验证失败，用户部门Id不能为空！")
-    private Long deptId;
+    private String deptId;
 
     /**
      * 用户类型(0: 管理员 1: 系统管理用户 2: 系统业务用户)。
@@ -104,13 +104,13 @@ public class SysUserDto extends MyPageParam {
      * 创建者Id。
      */
     @ApiModelProperty(value = "创建者Id")
-    private Long createUserId;
+    private String createUserId;
 
     /**
      * 更新者Id。
      */
     @ApiModelProperty(value = "更新者Id")
-    private Long updateUserId;
+    private String updateUserId;
 
     /**
      * 创建时间。

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

@@ -44,7 +44,7 @@ public class SysDataPerm {
      * 创建者Id。
      */
     @TableField(value = "create_user_id")
-    private Long createUserId;
+    private String createUserId;
 
     /**
      * 创建时间。
@@ -56,7 +56,7 @@ public class SysDataPerm {
      * 更新者Id。
      */
     @TableField(value = "update_user_id")
-    private Long updateUserId;
+    private String updateUserId;
 
     /**
      * 更新时间。

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

@@ -56,13 +56,13 @@ public class SysDept {
      * 创建者Id。
      */
     @TableField(value = "create_user_id")
-    private Long createUserId;
+    private String createUserId;
 
     /**
      * 更新者Id。
      */
     @TableField(value = "update_user_id")
-    private Long updateUserId;
+    private String updateUserId;
 
     /**
      * 创建时间。

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

@@ -25,13 +25,13 @@ public class SysMenu {
      * 菜单Id。
      */
     @TableId(value = "menu_id")
-    private Long menuId;
+    private String menuId;
 
     /**
      * 父菜单Id，目录菜单的父菜单为null。
      */
     @TableField(value = "parent_id")
-    private Long parentId;
+    private String parentId;
 
     /**
      * 菜单显示名称。
@@ -55,7 +55,7 @@ public class SysMenu {
      * 在线表单主键Id，仅用于在线表单绑定的菜单。
      */
     @TableField(value = "online_form_id")
-    private Long onlineFormId;
+    private String onlineFormId;
 
     /**
      * 在线表单菜单的权限控制类型，具体值可参考SysOnlineMenuPermType常量对象。
@@ -67,13 +67,13 @@ public class SysMenu {
      * 统计页面主键Id，仅用于统计页面绑定的菜单。
      */
     @TableField(value = "report_page_id")
-    private Long reportPageId;
+    private String reportPageId;
 
     /**
      * 仅用于在线表单的流程Id。
      */
     @TableField(value = "online_flow_entry_id")
-    private Long onlineFlowEntryId;
+    private String onlineFlowEntryId;
 
     /**
      * 菜单显示顺序 (值越小，排序越靠前)。
@@ -90,7 +90,7 @@ public class SysMenu {
      * 创建者Id。
      */
     @TableField(value = "create_user_id")
-    private Long createUserId;
+    private String createUserId;
 
     /**
      * 创建时间。
@@ -102,7 +102,7 @@ public class SysMenu {
      * 更新者Id。
      */
     @TableField(value = "update_user_id")
-    private Long updateUserId;
+    private String updateUserId;
 
     /**
      * 更新时间。

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

@@ -17,11 +17,11 @@ public class SysMenuPermCode {
      * 关联菜单Id。
      */
     @TableField(value = "menu_id")
-    private Long menuId;
+    private String menuId;
 
     /**
      * 关联权限字Id。
      */
     @TableField(value = "perm_code_id")
-    private Long permCodeId;
+    private String permCodeId;
 }

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

@@ -20,13 +20,13 @@ public class SysPerm {
      * 权限资源Id。
      */
     @TableId(value = "perm_id")
-    private Long permId;
+    private String permId;
 
     /**
      * 权限所在的权限模块Id。
      */
     @TableField(value = "module_id")
-    private Long moduleId;
+    private String moduleId;
 
     /**
      * 权限名称。
@@ -49,7 +49,7 @@ public class SysPerm {
      * 创建者Id。
      */
     @TableField(value = "create_user_id")
-    private Long createUserId;
+    private String createUserId;
 
     /**
      * 创建时间。
@@ -61,7 +61,7 @@ public class SysPerm {
      * 更新者Id。
      */
     @TableField(value = "update_user_id")
-    private Long updateUserId;
+    private String updateUserId;
 
     /**
      * 更新时间。

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

@@ -25,13 +25,13 @@ public class SysPermCode {
      * 权限字Id。
      */
     @TableId(value = "perm_code_id")
-    private Long permCodeId;
+    private String permCodeId;
 
     /**
      * 上级权限字Id。
      */
     @TableField(value = "parent_id")
-    private Long parentId;
+    private String parentId;
 
     /**
      * 权限字标识(一般为有含义的英文字符串)。
@@ -61,7 +61,7 @@ public class SysPermCode {
      * 创建者Id。
      */
     @TableField(value = "create_user_id")
-    private Long createUserId;
+    private String createUserId;
 
     /**
      * 创建时间。
@@ -73,7 +73,7 @@ public class SysPermCode {
      * 更新者Id。
      */
     @TableField(value = "update_user_id")
-    private Long updateUserId;
+    private String updateUserId;
 
     /**
      * 更新时间。

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

@@ -17,11 +17,11 @@ public class SysPermCodePerm {
      * 权限字Id。
      */
     @TableField(value = "perm_code_id")
-    private Long permCodeId;
+    private String permCodeId;
 
     /**
      * 权限Id。
      */
     @TableField(value = "perm_id")
-    private Long permId;
+    private String permId;
 }

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

@@ -19,13 +19,13 @@ public class SysPermModule {
      * 权限模块Id。
      */
     @TableId(value = "module_id")
-    private Long moduleId;
+    private String moduleId;
 
     /**
      * 上级权限模块Id。
      */
     @TableField(value = "parent_id")
-    private Long parentId;
+    private String parentId;
 
     /**
      * 权限模块名称。
@@ -49,7 +49,7 @@ public class SysPermModule {
      * 创建者Id。
      */
     @TableField(value = "create_user_id")
-    private Long createUserId;
+    private String createUserId;
 
     /**
      * 创建时间。
@@ -61,7 +61,7 @@ public class SysPermModule {
      * 更新者Id。
      */
     @TableField(value = "update_user_id")
-    private Long updateUserId;
+    private String updateUserId;
 
     /**
      * 更新时间。

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

@@ -23,7 +23,7 @@ public class SysPost {
      * 岗位Id。
      */
     @TableId(value = "post_id")
-    private Long postId;
+    private String postId;
 
     /**
      * 岗位名称。
@@ -47,7 +47,7 @@ public class SysPost {
      * 创建者Id。
      */
     @TableField(value = "create_user_id")
-    private Long createUserId;
+    private String createUserId;
 
     /**
      * 创建时间。
@@ -59,7 +59,7 @@ public class SysPost {
      * 更新者Id。
      */
     @TableField(value = "update_user_id")
-    private Long updateUserId;
+    private String updateUserId;
 
     /**
      * 更新时间。

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

@@ -37,7 +37,7 @@ public class SysRole {
      * 创建者Id。
      */
     @TableField(value = "create_user_id")
-    private Long createUserId;
+    private String createUserId;
 
     /**
      * 创建时间。
@@ -49,7 +49,7 @@ public class SysRole {
      * 更新者Id。
      */
     @TableField(value = "update_user_id")
-    private Long updateUserId;
+    private String updateUserId;
 
     /**
      * 更新时间。

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

@@ -96,13 +96,13 @@ public class SysUser {
      * 创建者Id。
      */
     @TableField(value = "create_user_id")
-    private Long createUserId;
+    private String createUserId;
 
     /**
      * 更新者Id。
      */
     @TableField(value = "update_user_id")
-    private Long updateUserId;
+    private String updateUserId;
 
     /**
      * 创建时间。

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

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

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

@@ -21,7 +21,7 @@ public interface SysMenuService extends IBaseService<SysMenu, Long> {
      * @param permCodeIdSet 权限字Id列表。
      * @return 新增后的菜单对象。
      */
-    SysMenu saveNew(SysMenu sysMenu, Set<Long> permCodeIdSet);
+    SysMenu saveNew(SysMenu sysMenu, Set<String> permCodeIdSet);
 
     /**
      * 更新菜单对象。
@@ -31,7 +31,7 @@ public interface SysMenuService extends IBaseService<SysMenu, Long> {
      * @param permCodeIdSet   权限字Id列表。
      * @return 更新成功返回true，否则false。
      */
-    boolean update(SysMenu sysMenu, SysMenu originalSysMenu, Set<Long> permCodeIdSet);
+    boolean update(SysMenu sysMenu, SysMenu originalSysMenu, Set<String> permCodeIdSet);
 
     /**
      * 删除指定的菜单。
@@ -47,7 +47,7 @@ public interface SysMenuService extends IBaseService<SysMenu, Long> {
      * @param userId 用户主键Id。
      * @return 用户关联的菜单列表。
      */
-    Collection<SysMenu> getMenuListByUserId(Long userId);
+    Collection<SysMenu> getMenuListByUserId(String userId);
 
     /**
      * 查询角色Id列表下的所有菜单和与其关联的权限资源url。
@@ -63,7 +63,7 @@ public interface SysMenuService extends IBaseService<SysMenu, Long> {
      * @param menuId 菜单主键Id。
      * @return 存在返回true，否则false。
      */
-    boolean hasChildren(Long menuId);
+    boolean hasChildren(String menuId);
 
     /**
      * 验证菜单对象关联的数据是否都合法。

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

@@ -36,7 +36,7 @@ public interface SysPermCodeService extends IBaseService<SysPermCode, Long> {
      * @param permIdSet   权限资源Id列表。
      * @return 新增后的权限字对象。
      */
-    SysPermCode saveNew(SysPermCode sysPermCode, Set<Long> permIdSet);
+    SysPermCode saveNew(SysPermCode sysPermCode, Set<String> permIdSet);
 
     /**
      * 更新权限字对象。
@@ -46,7 +46,7 @@ public interface SysPermCodeService extends IBaseService<SysPermCode, Long> {
      * @param permIdSet           权限资源Id列表。
      * @return 更新成功返回true，否则false。
      */
-    boolean update(SysPermCode sysPermCode, SysPermCode originalSysPermCode, Set<Long> permIdSet);
+    boolean update(SysPermCode sysPermCode, SysPermCode originalSysPermCode, Set<String> permIdSet);
 
     /**
      * 删除指定的权限字。
@@ -54,7 +54,7 @@ public interface SysPermCodeService extends IBaseService<SysPermCode, Long> {
      * @param permCodeId 权限字主键Id。
      * @return 删除成功返回true，否则false。
      */
-    boolean remove(Long permCodeId);
+    boolean remove(String permCodeId);
 
     /**
      * 判断当前权限字是否存在下级权限字对象。
@@ -62,7 +62,7 @@ public interface SysPermCodeService extends IBaseService<SysPermCode, Long> {
      * @param permCodeId 权限字主键Id。
      * @return 存在返回true，否则false。
      */
-    boolean hasChildren(Long permCodeId);
+    boolean hasChildren(String permCodeId);
 
     /**
      * 验证权限字对象关联的数据是否都合法。

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

@@ -51,7 +51,7 @@ public interface SysPermModuleService extends IBaseService<SysPermModule, Long>
      * @param moduleId 权限资源模块主键Id。
      * @return 存在返回true，否则false。
      */
-    boolean hasChildren(Long moduleId);
+    boolean hasChildren(String moduleId);
 
     /**
      * 判断是否存在权限数据。
@@ -59,5 +59,5 @@ public interface SysPermModuleService extends IBaseService<SysPermModule, Long>
      * @param moduleId 权限资源模块主键Id。
      * @return 存在返回true，否则false。
      */
-    boolean hasModulePerms(Long moduleId);
+    boolean hasModulePerms(String moduleId);
 }

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

@@ -36,7 +36,7 @@ public interface SysPermService extends IBaseService<SysPerm, Long> {
      * @param permId 权限资源主键Id。
      * @return 删除成功返回true，否则false。
      */
-    boolean remove(Long permId);
+    boolean remove(String permId);
 
     /**
      * 获取权限数据列表。

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

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

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

@@ -53,7 +53,7 @@ public interface SysUserService extends IBaseService<SysUser, String> {
      * @param newPass 新密码。
      * @return 成功返回true，否则false。
      */
-    boolean changePassword(Long userId, String newPass);
+    boolean changePassword(String userId, String newPass);
 
     /**
      * 修改用户头像。
@@ -62,7 +62,7 @@ public interface SysUserService extends IBaseService<SysUser, String> {
      * @param newHeadImage 新的头像信息。
      * @return 成功返回true，否则false。
      */
-    boolean changeHeadImage(Long userId, String newHeadImage);
+    boolean changeHeadImage(String userId, String newHeadImage);
 
     /**
      * 删除指定数据。

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

@@ -2,6 +2,8 @@ package com.ankaibei.workFlow.webadmin.upms.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
+import cn.jimmyshi.beanquery.BeanQuery;
+import com.ankaibei.workFlow.common.core.object.ResponseResult;
 import com.baomidou.mybatisplus.core.conditions.query.*;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.ankaibei.workFlow.webadmin.upms.service.*;
@@ -65,7 +67,7 @@ public class SysDeptServiceImpl extends BaseService<SysDept, Long> implements Sy
     @Transactional(rollbackFor = Exception.class)
     @Override
     public SysDept saveNew(SysDept sysDept, SysDept parentSysDept) {
-        sysDept.setDeptId(String.valueOf(idGenerator.nextLongId()));
+        sysDept.setDeptId(idGenerator.nextLongId() + "");
         sysDept.setDeletedFlag(GlobalDeletedFlag.NORMAL);
         MyModelUtil.fillCommonsForInsert(sysDept);
         sysDeptMapper.insert(sysDept);
@@ -155,17 +157,17 @@ public class SysDeptServiceImpl extends BaseService<SysDept, Long> implements Sy
      */
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public boolean remove(String deptId) {
+    public boolean remove(Long deptId) {
         if (sysDeptMapper.deleteById(deptId) == 0) {
             return false;
         }
         // 这里删除当前部门及其父部门的关联关系。
         // 当前部门和子部门的关系无需在这里删除，因为包含子部门时不能删除父部门。
         SysDeptRelation deptRelation = new SysDeptRelation();
-        deptRelation.setDeptId(deptId);
+        deptRelation.setDeptId(deptId + "");
         sysDeptRelationMapper.delete(new QueryWrapper<>(deptRelation));
         SysDataPermDept dataPermDept = new SysDataPermDept();
-        dataPermDept.setDeptId(deptId);
+        dataPermDept.setDeptId(deptId + "");
         sysDataPermDeptMapper.delete(new QueryWrapper<>(dataPermDept));
         return true;
     }
@@ -207,9 +209,9 @@ public class SysDeptServiceImpl extends BaseService<SysDept, Long> implements Sy
      * @return 存在返回true，否则false。
      */
     @Override
-    public boolean hasChildren(String deptId) {
+    public boolean hasChildren(Long deptId) {
         SysDept filter = new SysDept();
-        filter.setParentId(deptId);
+        filter.setParentId(deptId + "");
         return getCountByFilter(filter) > 0;
     }
 
@@ -220,9 +222,9 @@ public class SysDeptServiceImpl extends BaseService<SysDept, Long> implements Sy
      * @return 存在返回true，否则false。
      */
     @Override
-    public boolean hasChildrenUser(String deptId) {
+    public boolean hasChildrenUser(Long deptId) {
         SysUser sysUser = new SysUser();
-        sysUser.setDeptId(deptId);
+        sysUser.setDeptId(deptId + "");
         return sysUserService.getCountByFilter(sysUser) > 0;
     }
 
@@ -234,10 +236,10 @@ public class SysDeptServiceImpl extends BaseService<SysDept, Long> implements Sy
      */
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public void addSysDeptPostList(List<SysDeptPost> sysDeptPostList, String deptId) {
+    public void addSysDeptPostList(List<SysDeptPost> sysDeptPostList, Long deptId) {
         for (SysDeptPost sysDeptPost : sysDeptPostList) {
-            sysDeptPost.setDeptPostId(String.valueOf(idGenerator.nextLongId()));
-            sysDeptPost.setDeptId(deptId);
+            sysDeptPost.setDeptPostId(idGenerator.nextLongId() + "");
+            sysDeptPost.setDeptId(deptId + "");
             sysDeptPostMapper.insert(sysDeptPost);
         }
     }
@@ -270,10 +272,10 @@ public class SysDeptServiceImpl extends BaseService<SysDept, Long> implements Sy
      */
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public boolean removeSysDeptPost(String deptId, String postId) {
+    public boolean removeSysDeptPost(Long deptId, Long postId) {
         SysDeptPost filter = new SysDeptPost();
-        filter.setDeptId(deptId);
-        filter.setPostId(postId);
+        filter.setDeptId(deptId + "");
+        filter.setPostId(postId + "");
         return sysDeptPostMapper.delete(new QueryWrapper<>(filter)) > 0;
     }
 
@@ -285,10 +287,10 @@ public class SysDeptServiceImpl extends BaseService<SysDept, Long> implements Sy
      * @return 中间表对象。
      */
     @Override
-    public SysDeptPost getSysDeptPost(String deptId, String postId) {
+    public SysDeptPost getSysDeptPost(Long deptId, Long postId) {
         SysDeptPost filter = new SysDeptPost();
-        filter.setDeptId(deptId);
-        filter.setPostId(postId);
+        filter.setDeptId(deptId + "");
+        filter.setPostId(postId + "");
         return sysDeptPostMapper.selectOne(new QueryWrapper<>(filter));
     }
 
@@ -326,7 +328,7 @@ public class SysDeptServiceImpl extends BaseService<SysDept, Long> implements Sy
 
     @Override
     public List<String> getLeaderDeptPostIdList(String deptId) {
-        List<SysDeptPost> resultList = sysDeptPostMapper.getLeaderDeptPostList(deptId);
+        List<SysDeptPost> resultList = sysDeptPostMapper.getLeaderDeptPostList(deptId + "");
         return resultList.stream().map(SysDeptPost::getDeptPostId).collect(Collectors.toList());
     }
 
@@ -346,4 +348,33 @@ public class SysDeptServiceImpl extends BaseService<SysDept, Long> implements Sy
         return sysDeptRelationMapper.selectList(queryWrapper)
                 .stream().map(SysDeptRelation::getDeptId).collect(Collectors.toList());
     }
+
+    /**
+     * 处理集合数据中精度丢失
+     *
+     * @param mapList
+     * @return
+     */
+    @Override
+    public List<Map<String, String>> lossOfAccuracy(List<Map<String, Object>> mapList) {
+        //object 转为string避免精度丢失
+        List<Map<String, String>> newList = new ArrayList<>();
+        for (Map<String, Object> map : mapList) {
+            Map<String, String> newMap = new HashMap<>();
+
+            for (Map.Entry<String, Object> entry : map.entrySet()) {
+                String key = entry.getKey();
+                Object value = entry.getValue();
+
+                if (value != null) {
+                    String stringValue = value.toString();
+                    newMap.put(key, stringValue);
+                }
+            }
+
+            newList.add(newMap);
+        }
+        return newList;
+    }
+
 }

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

@@ -70,12 +70,12 @@ public class SysMenuServiceImpl extends BaseService<SysMenu, Long> implements Sy
      */
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public SysMenu saveNew(SysMenu sysMenu, Set<Long> permCodeIdSet) {
-        sysMenu.setMenuId(idGenerator.nextLongId());
+    public SysMenu saveNew(SysMenu sysMenu, Set<String> permCodeIdSet) {
+        sysMenu.setMenuId(idGenerator.nextLongId() + "");
         MyModelUtil.fillCommonsForInsert(sysMenu);
         sysMenuMapper.insert(sysMenu);
         if (permCodeIdSet != null) {
-            for (Long permCodeId : permCodeIdSet) {
+            for (String permCodeId : permCodeIdSet) {
                 SysMenuPermCode menuPermCode = new SysMenuPermCode();
                 menuPermCode.setMenuId(sysMenu.getMenuId());
                 menuPermCode.setPermCodeId(permCodeId);
@@ -85,7 +85,7 @@ public class SysMenuServiceImpl extends BaseService<SysMenu, Long> implements Sy
         // 判断当前菜单是否为指向在线表单的菜单，并将根据约定，动态插入两个子菜单。
         if (sysMenu.getOnlineFormId() != null && sysMenu.getOnlineFlowEntryId() == null) {
             SysMenu viewSubMenu = new SysMenu();
-            viewSubMenu.setMenuId(idGenerator.nextLongId());
+            viewSubMenu.setMenuId(idGenerator.nextLongId() + "");
             viewSubMenu.setParentId(sysMenu.getMenuId());
             viewSubMenu.setMenuType(SysMenuType.TYPE_BUTTON);
             viewSubMenu.setMenuName("查看");
@@ -95,7 +95,7 @@ public class SysMenuServiceImpl extends BaseService<SysMenu, Long> implements Sy
             MyModelUtil.fillCommonsForInsert(viewSubMenu);
             sysMenuMapper.insert(viewSubMenu);
             SysMenu editSubMenu = new SysMenu();
-            editSubMenu.setMenuId(idGenerator.nextLongId());
+            editSubMenu.setMenuId(idGenerator.nextLongId() + "");
             editSubMenu.setParentId(sysMenu.getMenuId());
             editSubMenu.setMenuType(SysMenuType.TYPE_BUTTON);
             editSubMenu.setMenuName("编辑");
@@ -118,10 +118,10 @@ public class SysMenuServiceImpl extends BaseService<SysMenu, Long> implements Sy
      */
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public boolean update(SysMenu sysMenu, SysMenu originalSysMenu, Set<Long> permCodeIdSet) {
+    public boolean update(SysMenu sysMenu, SysMenu originalSysMenu, Set<String> permCodeIdSet) {
         MyModelUtil.fillCommonsForUpdate(sysMenu, originalSysMenu);
         sysMenu.setMenuType(originalSysMenu.getMenuType());
-        UpdateWrapper<SysMenu> uw = this.createUpdateQueryForNullValue(sysMenu, sysMenu.getMenuId());
+        UpdateWrapper<SysMenu> uw = this.createUpdateQueryForNullValue(sysMenu, Long.valueOf(sysMenu.getMenuId()));
         if (sysMenuMapper.update(sysMenu, uw) != 1) {
             return false;
         }
@@ -129,7 +129,7 @@ public class SysMenuServiceImpl extends BaseService<SysMenu, Long> implements Sy
         deletedMenuPermCode.setMenuId(sysMenu.getMenuId());
         sysMenuPermCodeMapper.delete(new QueryWrapper<>(deletedMenuPermCode));
         if (permCodeIdSet != null) {
-            for (Long permCodeId : permCodeIdSet) {
+            for (String permCodeId : permCodeIdSet) {
                 SysMenuPermCode menuPermCode = new SysMenuPermCode();
                 menuPermCode.setMenuId(sysMenu.getMenuId());
                 menuPermCode.setPermCodeId(permCodeId);
@@ -155,7 +155,7 @@ public class SysMenuServiceImpl extends BaseService<SysMenu, Long> implements Sy
     @Transactional(rollbackFor = Exception.class)
     @Override
     public boolean remove(SysMenu menu) {
-        Long menuId = menu.getMenuId();
+        String menuId = menu.getMenuId();
         if (sysMenuMapper.deleteById(menuId) != 1) {
             return false;
         }
@@ -179,9 +179,9 @@ public class SysMenuServiceImpl extends BaseService<SysMenu, Long> implements Sy
      * @return 用户关联的菜单列表。
      */
     @Override
-    public Collection<SysMenu> getMenuListByUserId(Long userId) {
+    public Collection<SysMenu> getMenuListByUserId(String userId) {
         List<SysMenu> menuList = sysMenuMapper.getMenuListByUserId(userId);
-        LinkedHashMap<Long, SysMenu> menuMap = new LinkedHashMap<>();
+        LinkedHashMap<String, SysMenu> menuMap = new LinkedHashMap<>();
         for (SysMenu menu : menuList) {
             menuMap.put(menu.getMenuId(), menu);
         }
@@ -203,7 +203,7 @@ public class SysMenuServiceImpl extends BaseService<SysMenu, Long> implements Sy
      * @return 存在返回true，否则false。
      */
     @Override
-    public boolean hasChildren(Long menuId) {
+    public boolean hasChildren(String menuId) {
         SysMenu menu = new SysMenu();
         menu.setParentId(menuId);
         return this.getCountByFilter(menu) > 0;

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

@@ -88,12 +88,12 @@ public class SysPermCodeServiceImpl extends BaseService<SysPermCode, Long> imple
      */
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public SysPermCode saveNew(SysPermCode sysPermCode, Set<Long> permIdSet) {
-        sysPermCode.setPermCodeId(idGenerator.nextLongId());
+    public SysPermCode saveNew(SysPermCode sysPermCode, Set<String> permIdSet) {
+        sysPermCode.setPermCodeId(idGenerator.nextLongId() + "");
         MyModelUtil.fillCommonsForInsert(sysPermCode);
         sysPermCodeMapper.insert(sysPermCode);
         if (permIdSet != null) {
-            for (Long permId : permIdSet) {
+            for (String permId : permIdSet) {
                 SysPermCodePerm permCodePerm = new SysPermCodePerm();
                 permCodePerm.setPermCodeId(sysPermCode.getPermCodeId());
                 permCodePerm.setPermId(permId);
@@ -113,11 +113,11 @@ public class SysPermCodeServiceImpl extends BaseService<SysPermCode, Long> imple
      */
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public boolean update(SysPermCode sysPermCode, SysPermCode originalSysPermCode, Set<Long> permIdSet) {
+    public boolean update(SysPermCode sysPermCode, SysPermCode originalSysPermCode, Set<String> permIdSet) {
         MyModelUtil.fillCommonsForUpdate(sysPermCode, originalSysPermCode);
         sysPermCode.setParentId(originalSysPermCode.getParentId());
         UpdateWrapper<SysPermCode> uw =
-                this.createUpdateQueryForNullValue(sysPermCode, sysPermCode.getPermCodeId());
+                this.createUpdateQueryForNullValue(sysPermCode, Long.valueOf(sysPermCode.getPermCodeId()));
         if (sysPermCodeMapper.update(sysPermCode, uw) != 1) {
             return false;
         }
@@ -125,7 +125,7 @@ public class SysPermCodeServiceImpl extends BaseService<SysPermCode, Long> imple
         deletedPermCodePerm.setPermCodeId(sysPermCode.getPermCodeId());
         sysPermCodePermMapper.delete(new QueryWrapper<>(deletedPermCodePerm));
         if (permIdSet != null) {
-            for (Long permId : permIdSet) {
+            for (String permId : permIdSet) {
                 SysPermCodePerm permCodePerm = new SysPermCodePerm();
                 permCodePerm.setPermCodeId(sysPermCode.getPermCodeId());
                 permCodePerm.setPermId(permId);
@@ -143,7 +143,7 @@ public class SysPermCodeServiceImpl extends BaseService<SysPermCode, Long> imple
      */
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public boolean remove(Long permCodeId) {
+    public boolean remove(String permCodeId) {
         if (sysPermCodeMapper.deleteById(permCodeId) != 1) {
             return false;
         }
@@ -163,7 +163,7 @@ public class SysPermCodeServiceImpl extends BaseService<SysPermCode, Long> imple
      * @return 存在返回true，否则false。
      */
     @Override
-    public boolean hasChildren(Long permCodeId) {
+    public boolean hasChildren(String permCodeId) {
         SysPermCode permCode = new SysPermCode();
         permCode.setParentId(permCodeId);
         return this.getCountByFilter(permCode) > 0;

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

@@ -52,7 +52,7 @@ public class SysPermModuleServiceImpl extends BaseService<SysPermModule, Long> i
     @Transactional(rollbackFor = Exception.class)
     @Override
     public SysPermModule saveNew(SysPermModule sysPermModule) {
-        sysPermModule.setModuleId(idGenerator.nextLongId());
+        sysPermModule.setModuleId(idGenerator.nextLongId() + "");
         MyModelUtil.fillCommonsForInsert(sysPermModule);
         sysPermModuleMapper.insert(sysPermModule);
         return sysPermModule;
@@ -101,7 +101,7 @@ public class SysPermModuleServiceImpl extends BaseService<SysPermModule, Long> i
      * @return 存在返回true，否则false。
      */
     @Override
-    public boolean hasChildren(Long moduleId) {
+    public boolean hasChildren(String moduleId) {
         SysPermModule permModule = new SysPermModule();
         permModule.setParentId(moduleId);
         return this.getCountByFilter(permModule) > 0;
@@ -114,7 +114,7 @@ public class SysPermModuleServiceImpl extends BaseService<SysPermModule, Long> i
      * @return 存在返回true，否则false。
      */
     @Override
-    public boolean hasModulePerms(Long moduleId) {
+    public boolean hasModulePerms(String moduleId) {
         SysPerm filter = new SysPerm();
         filter.setModuleId(moduleId);
         return sysPermService.getCountByFilter(filter) > 0;

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

@@ -71,7 +71,7 @@ public class SysPermServiceImpl extends BaseService<SysPerm, Long> implements Sy
     @Transactional(rollbackFor = Exception.class)
     @Override
     public SysPerm saveNew(SysPerm perm) {
-        perm.setPermId(idGenerator.nextLongId());
+        perm.setPermId(idGenerator.nextLongId() + "");
         MyModelUtil.fillCommonsForInsert(perm);
         sysPermMapper.insert(perm);
         return perm;
@@ -99,7 +99,7 @@ public class SysPermServiceImpl extends BaseService<SysPerm, Long> implements Sy
      */
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public boolean remove(Long permId) {
+    public boolean remove(String permId) {
         if (sysPermMapper.deleteById(permId) != 1) {
             return false;
         }

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

@@ -62,7 +62,7 @@ public class SysPostServiceImpl extends BaseService<SysPost, Long> implements Sy
     @Transactional(rollbackFor = Exception.class)
     @Override
     public SysPost saveNew(SysPost sysPost) {
-        sysPost.setPostId(idGenerator.nextLongId());
+        sysPost.setPostId(idGenerator.nextLongId() + "");
         MyModelUtil.fillCommonsForInsert(sysPost);
         MyModelUtil.setDefaultValue(sysPost, "leaderPost", false);
         sysPostMapper.insert(sysPost);
@@ -81,7 +81,7 @@ public class SysPostServiceImpl extends BaseService<SysPost, Long> implements Sy
     public boolean update(SysPost sysPost, SysPost originalSysPost) {
         MyModelUtil.fillCommonsForUpdate(sysPost, originalSysPost);
         // 这里重点提示，在执行主表数据更新之前，如果有哪些字段不支持修改操作，请用原有数据对象字段替换当前数据字段。
-        UpdateWrapper<SysPost> uw = this.createUpdateQueryForNullValue(sysPost, sysPost.getPostId());
+        UpdateWrapper<SysPost> uw = this.createUpdateQueryForNullValue(sysPost, Long.valueOf(sysPost.getPostId()));
         return sysPostMapper.update(sysPost, uw) == 1;
     }
 
@@ -93,16 +93,16 @@ public class SysPostServiceImpl extends BaseService<SysPost, Long> implements Sy
      */
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public boolean remove(String postId) {
+    public boolean remove(Long postId) {
         if (sysPostMapper.deleteById(postId) != 1) {
             return false;
         }
         // 开始删除多对多父表的关联
         SysUserPost sysUserPost = new SysUserPost();
-        sysUserPost.setPostId(postId);
+        sysUserPost.setPostId(String.valueOf(postId));
         sysUserPostMapper.delete(new QueryWrapper<>(sysUserPost));
         SysDeptPost sysDeptPost = new SysDeptPost();
-        sysDeptPost.setPostId(postId);
+        sysDeptPost.setPostId(String.valueOf(postId));
         sysDeptPostMapper.delete(new QueryWrapper<>(sysDeptPost));
         return true;
     }
@@ -111,13 +111,12 @@ public class SysPostServiceImpl extends BaseService<SysPost, Long> implements Sy
      * 获取单表查询结果。由于没有关联数据查询，因此在仅仅获取单表数据的场景下，效率更高。
      * 如果需要同时获取关联数据，请移步(getSysPostListWithRelation)方法。
      *
-     * @param filter  过滤对象。
-     * @param orderBy 排序参数。
+     * @param filter 过滤对象。
      * @return 查询结果集。
      */
     @Override
-    public List<SysPost> getSysPostList(SysPost filter, String orderBy) {
-        return sysPostMapper.getSysPostList(filter, orderBy);
+    public List<SysPost> getSysPostList(SysPost filter) {
+        return sysPostMapper.getSysPostList(filter);
     }
 
     /**
@@ -125,13 +124,12 @@ public class SysPostServiceImpl extends BaseService<SysPost, Long> implements Sy
      * 该查询会涉及到一对一从表的关联过滤，或一对多从表的嵌套关联过滤，因此性能不如单表过滤。
      * 如果仅仅需要获取主表数据，请移步(getSysPostList)，以便获取更好的查询性能。
      *
-     * @param filter  主表过滤对象。
-     * @param orderBy 排序参数。
+     * @param filter 主表过滤对象。
      * @return 查询结果集。
      */
     @Override
-    public List<SysPost> getSysPostListWithRelation(SysPost filter, String orderBy) {
-        List<SysPost> resultList = sysPostMapper.getSysPostList(filter, orderBy);
+    public List<SysPost> getSysPostListWithRelation(SysPost filter) {
+        List<SysPost> resultList = sysPostMapper.getSysPostList(filter);
         // 在缺省生成的代码中，如果查询结果resultList不是Page对象，说明没有分页，那么就很可能是数据导出接口调用了当前方法。
         // 为了避免一次性的大量数据关联，规避因此而造成的系统运行性能冲击，这里手动进行了分批次读取，开发者可按需修改该值。
         int batchSize = resultList instanceof Page ? 0 : 1000;
@@ -144,12 +142,11 @@ public class SysPostServiceImpl extends BaseService<SysPost, Long> implements Sy
      *
      * @param deptId  主表主键Id。
      * @param filter  从表的过滤对象。
-     * @param orderBy 排序参数。
      * @return 查询结果集。
      */
     @Override
-    public List<SysPost> getNotInSysPostListByDeptId(Long deptId, SysPost filter, String orderBy) {
-        List<SysPost> resultList = sysPostMapper.getNotInSysPostListByDeptId(deptId, filter, orderBy);
+    public List<SysPost> getNotInSysPostListByDeptId(Long 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

@@ -197,18 +197,18 @@ public class SysUserServiceImpl extends BaseService<SysUser, String> implements
      */
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public boolean changePassword(Long userId, String newPass) {
+    public boolean changePassword(String userId, String newPass) {
         SysUser updatedUser = new SysUser();
-        updatedUser.setUserId(String.valueOf(userId));
+        updatedUser.setUserId(userId);
         updatedUser.setPassword(passwordEncoder.encode(newPass));
         return sysUserMapper.updateById(updatedUser) == 1;
     }
 
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public boolean changeHeadImage(Long userId, String newHeadImage) {
+    public boolean changeHeadImage(String userId, String newHeadImage) {
         SysUser updatedUser = new SysUser();
-        updatedUser.setUserId(String.valueOf(userId));
+        updatedUser.setUserId(userId);
         updatedUser.setHeadImageUrl(newHeadImage);
         return sysUserMapper.updateById(updatedUser) == 1;
     }

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

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

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

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

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

@@ -44,7 +44,7 @@ public class SysDataPermVo {
      * 创建者Id。
      */
     @ApiModelProperty(value = "创建者Id")
-    private Long createUserId;
+    private String createUserId;
 
     /**
      * 创建时间。
@@ -56,7 +56,7 @@ public class SysDataPermVo {
      * 更新者Id。
      */
     @ApiModelProperty(value = "更新者Id")
-    private Long updateUserId;
+    private String updateUserId;
 
     /**
      * 更新时间。

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

@@ -46,13 +46,13 @@ public class SysDeptVo {
      * 创建者Id。
      */
     @ApiModelProperty(value = "创建者Id")
-    private Long createUserId;
+    private String createUserId;
 
     /**
      * 更新者Id。
      */
     @ApiModelProperty(value = "更新者Id")
-    private Long updateUserId;
+    private String updateUserId;
 
     /**
      * 创建时间。

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

@@ -20,13 +20,13 @@ public class SysMenuVo {
      * 菜单Id。
      */
     @ApiModelProperty(value = "菜单Id")
-    private Long menuId;
+    private String menuId;
 
     /**
      * 父菜单Id，目录菜单的父菜单为null
      */
     @ApiModelProperty(value = "父菜单Id")
-    private Long parentId;
+    private String parentId;
 
     /**
      * 菜单显示名称。
@@ -50,7 +50,7 @@ public class SysMenuVo {
      * 在线表单主键Id，仅用于在线表单绑定的菜单。
      */
     @ApiModelProperty(value = "在线表单主键Id")
-    private Long onlineFormId;
+    private String onlineFormId;
 
     /**
      * 在线表单菜单的权限控制类型，具体值可参考SysOnlineMenuPermType常量对象。
@@ -62,13 +62,13 @@ public class SysMenuVo {
      * 统计页面主键Id，仅用于统计页面绑定的菜单。
      */
     @ApiModelProperty(value = "统计页面主键Id")
-    private Long reportPageId;
+    private String reportPageId;
 
     /**
      * 仅用于在线表单的流程Id。
      */
     @ApiModelProperty(value = "仅用于在线表单的流程Id")
-    private Long onlineFlowEntryId;
+    private String onlineFlowEntryId;
 
     /**
      * 菜单显示顺序 (值越小，排序越靠前)。
@@ -86,7 +86,7 @@ public class SysMenuVo {
      * 创建者Id。
      */
     @ApiModelProperty(value = "创建者Id")
-    private Long createUserId;
+    private String createUserId;
 
     /**
      * 创建时间。
@@ -98,7 +98,7 @@ public class SysMenuVo {
      * 更新者Id。
      */
     @ApiModelProperty(value = "更新者Id")
-    private Long updateUserId;
+    private String updateUserId;
 
     /**
      * 更新时间。

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

@@ -20,7 +20,7 @@ public class SysPermCodeVo {
      * 权限字Id。
      */
     @ApiModelProperty(value = "权限字Id")
-    private Long permCodeId;
+    private String permCodeId;
 
     /**
      * 权限字标识(一般为有含义的英文字符串)。
@@ -32,7 +32,7 @@ public class SysPermCodeVo {
      * 上级权限字Id。
      */
     @ApiModelProperty(value = "上级权限字Id")
-    private Long parentId;
+    private String parentId;
 
     /**
      * 权限字类型(0: 表单 1: UI片段 2: 操作)。
@@ -56,7 +56,7 @@ public class SysPermCodeVo {
      * 创建者Id。
      */
     @ApiModelProperty(value = "创建者Id")
-    private Long createUserId;
+    private String createUserId;
 
     /**
      * 创建时间。
@@ -68,7 +68,7 @@ public class SysPermCodeVo {
      * 更新者Id。
      */
     @ApiModelProperty(value = "更新者Id")
-    private Long updateUserId;
+    private String updateUserId;
 
     /**
      * 更新时间。

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

@@ -20,7 +20,7 @@ public class SysPermModuleVo {
      * 权限模块Id。
      */
     @ApiModelProperty(value = "权限模块Id")
-    private Long moduleId;
+    private String moduleId;
 
     /**
      * 权限模块名称。
@@ -32,7 +32,7 @@ public class SysPermModuleVo {
      * 上级权限模块Id。
      */
     @ApiModelProperty(value = "上级权限模块Id")
-    private Long parentId;
+    private String parentId;
 
     /**
      * 权限模块类型(0: 普通模块 1: Controller模块)。
@@ -50,7 +50,7 @@ public class SysPermModuleVo {
      * 创建者Id。
      */
     @ApiModelProperty(value = "创建者Id")
-    private Long createUserId;
+    private String createUserId;
 
     /**
      * 创建时间。
@@ -62,7 +62,7 @@ public class SysPermModuleVo {
      * 更新者Id。
      */
     @ApiModelProperty(value = "更新者Id")
-    private Long updateUserId;
+    private String updateUserId;
 
     /**
      * 更新时间。

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

@@ -20,7 +20,7 @@ public class SysPermVo {
      * 权限资源Id。
      */
     @ApiModelProperty(value = "权限资源Id")
-    private Long permId;
+    private String permId;
 
     /**
      * 权限资源名称。
@@ -38,7 +38,7 @@ public class SysPermVo {
      * 权限所在的权限模块Id。
      */
     @ApiModelProperty(value = "权限所在的权限模块Id")
-    private Long moduleId;
+    private String moduleId;
 
     /**
      * 关联的URL。
@@ -56,7 +56,7 @@ public class SysPermVo {
      * 创建者Id。
      */
     @ApiModelProperty(value = "创建者Id")
-    private Long createUserId;
+    private String createUserId;
 
     /**
      * 创建时间。
@@ -68,7 +68,7 @@ public class SysPermVo {
      * 更新者Id。
      */
     @ApiModelProperty(value = "更新者Id")
-    private Long updateUserId;
+    private String updateUserId;
 
     /**
      * 更新时间。

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

@@ -0,0 +1,51 @@
+package com.ankaibei.workFlow.webadmin.upms.vo;
+
+import com.ankaibei.workFlow.common.core.base.mapper.BaseModelMapper;
+import com.ankaibei.workFlow.webadmin.upms.model.SysPost;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
+import org.mapstruct.factory.Mappers;
+
+/**
+ * 岗位list返回VO对象。
+ *
+ * @author Buzhanyi
+ * @date 2022-09-25
+ */
+@ApiModel("岗位VO")
+@Data
+public class SysPostReposVo {
+
+
+    private String id;
+
+
+    private String name;
+
+    @Mapper
+    public interface SysPostModelMapper extends BaseModelMapper<SysPostVo, SysPost> {
+        /**
+         * 转换Vo对象到实体对象。
+         *
+         * @param sysPostVo 域对象。
+         * @return 实体对象。
+         */
+        @Mapping(target = "sysDeptPost", expression = "java(mapToBean(sysPostVo.getSysDeptPost(), com.ankaibei.workFlow.webadmin.upms.model.SysDeptPost.class))")
+        @Override
+        SysPost toModel(SysPostVo sysPostVo);
+
+        /**
+         * 转换实体对象到VO对象。
+         *
+         * @param sysPost 实体对象。
+         * @return 域对象。
+         */
+        @Mapping(target = "sysDeptPost", expression = "java(beanToMap(sysPost.getSysDeptPost(), false))")
+        @Override
+        SysPostVo fromModel(SysPost sysPost);
+    }
+
+    public static final SysPost.SysPostModelMapper INSTANCE = Mappers.getMapper(SysPost.SysPostModelMapper.class);
+}

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

@@ -21,7 +21,7 @@ public class SysPostVo {
      * 岗位Id。
      */
     @ApiModelProperty(value = "岗位Id")
-    private Long postId;
+    private String postId;
 
     /**
      * 岗位名称。
@@ -45,7 +45,7 @@ public class SysPostVo {
      * 创建者Id。
      */
     @ApiModelProperty(value = "创建者Id")
-    private Long createUserId;
+    private String createUserId;
 
     /**
      * 创建时间。
@@ -57,7 +57,7 @@ public class SysPostVo {
      * 更新者Id。
      */
     @ApiModelProperty(value = "更新者Id")
-    private Long updateUserId;
+    private String updateUserId;
 
     /**
      * 更新时间。

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

@@ -20,7 +20,7 @@ public class SysRoleVo {
      * 角色Id。
      */
     @ApiModelProperty(value = "角色Id")
-    private Long roleId;
+    private String roleId;
 
     /**
      * 角色名称。
@@ -32,7 +32,7 @@ public class SysRoleVo {
      * 创建者Id。
      */
     @ApiModelProperty(value = "创建者Id")
-    private Long createUserId;
+    private String createUserId;
 
     /**
      * 创建时间。
@@ -44,7 +44,7 @@ public class SysRoleVo {
      * 更新者Id。
      */
     @ApiModelProperty(value = "更新者Id")
-    private Long updateUserId;
+    private String updateUserId;
 
     /**
      * 更新时间。

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

@@ -41,7 +41,7 @@ public class SysUserVo {
      * 用户部门Id。
      */
     @ApiModelProperty(value = "用户部门Id")
-    private Long deptId;
+    private String deptId;
 
     /**
      * 用户类型(0: 管理员 1: 系统管理用户 2: 系统业务用户)。
@@ -89,13 +89,13 @@ public class SysUserVo {
      * 创建者Id。
      */
     @ApiModelProperty(value = "创建者Id")
-    private Long createUserId;
+    private String createUserId;
 
     /**
      * 更新者Id。
      */
     @ApiModelProperty(value = "更新者Id")
-    private Long updateUserId;
+    private String updateUserId;
 
     /**
      * 创建时间。

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

@@ -20,17 +20,17 @@ public class LoginUserInfo {
     /**
      * 用户Id。
      */
-    private Long userId;
+    private String userId;
     /**
      * 用户所在部门Id。
      * 仅当系统支持uaa时可用，否则可以直接忽略该字段。保留该字段是为了保持单体和微服务通用代码部分的兼容性。
      */
-    private Long deptId;
+    private String deptId;
     /**
      * 租户Id。
      * 仅当系统支持uaa时可用，否则可以直接忽略该字段。保留该字段是为了保持单体和微服务通用代码部分的兼容性。
      */
-    private Long tenantId;
+    private String tenantId;
     /**
      * 是否为超级管理员。
      */

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

@@ -24,7 +24,7 @@ public class TokenData {
     /**
      * 用户Id。
      */
-    private Long userId;
+    private String userId;
     /**
      * 用户所属角色。多个角色之间逗号分隔。
      */
@@ -46,7 +46,7 @@ public class TokenData {
      * 租户Id。
      * 仅当系统支持uaa时可用，否则可以直接忽略该字段。保留该字段是为了保持单体和微服务通用代码部分的兼容性。
      */
-    private Long tenantId;
+    private String tenantId;
     /**
      * 是否为超级管理员。
      */

common/common-dict/src/main/java/com/ankaibei/workFlow/common/dict/dto/GlobalDictDto.java

@@ -23,7 +23,7 @@ public class GlobalDictDto {
      */
     @ApiModelProperty(value = "主键Id")
     @NotNull(message = "数据验证失败，主键Id不能为空！", groups = {UpdateGroup.class})
-    private Long dictId;
+    private String dictId;
 
     /**
      * 字典编码。

common/common-dict/src/main/java/com/ankaibei/workFlow/common/dict/dto/GlobalDictItemDto.java

@@ -23,7 +23,7 @@ public class GlobalDictItemDto {
      */
     @ApiModelProperty(value = "主键Id")
     @NotNull(message = "数据验证失败，主键Id不能为空！", groups = {UpdateGroup.class})
-    private Long id;
+    private String id;
 
     /**
      * 字典编码。

common/common-dict/src/main/java/com/ankaibei/workFlow/common/dict/model/GlobalDict.java

@@ -19,7 +19,7 @@ public class GlobalDict {
      * 主键Id。
      */
     @TableId(value = "dict_id")
-    private Long dictId;
+    private String dictId;
 
     /**
      * 字典编码。
@@ -37,7 +37,7 @@ public class GlobalDict {
      * 创建用户Id。
      */
     @TableField(value = "create_user_id")
-    private Long createUserId;
+    private String createUserId;
 
     /**
      * 创建时间。
@@ -49,7 +49,7 @@ public class GlobalDict {
      * 更新用户名。
      */
     @TableField(value = "update_user_id")
-    private Long updateUserId;
+    private String updateUserId;
 
     /**
      * 更新时间。

common/common-dict/src/main/java/com/ankaibei/workFlow/common/dict/model/GlobalDictItem.java

@@ -19,7 +19,7 @@ public class GlobalDictItem {
      * 主键Id。
      */
     @TableId(value = "id")
-    private Long id;
+    private String id;
 
     /**
      * 字典编码。
@@ -54,7 +54,7 @@ public class GlobalDictItem {
      * 创建用户Id。
      */
     @TableField(value = "create_user_id")
-    private Long createUserId;
+    private String createUserId;
 
     /**
      * 创建时间。
@@ -66,7 +66,7 @@ public class GlobalDictItem {
      * 更新用户名。
      */
     @TableField(value = "update_user_id")
-    private Long updateUserId;
+    private String updateUserId;
 
     /**
      * 更新时间。

common/common-dict/src/main/java/com/ankaibei/workFlow/common/dict/model/TenantGlobalDictItem.java

@@ -20,5 +20,5 @@ public class TenantGlobalDictItem extends GlobalDictItem {
      * 租户Id。
      */
     @TableField(value = "tenant_id")
-    private Long tenantId;
+    private String tenantId;
 }

common/common-dict/src/main/java/com/ankaibei/workFlow/common/dict/service/impl/GlobalDictItemServiceImpl.java

@@ -52,7 +52,7 @@ public class GlobalDictItemServiceImpl
     @Override
     public GlobalDictItem saveNew(GlobalDictItem globalDictItem) {
         globalDictService.removeCache(globalDictItem.getDictCode());
-        globalDictItem.setId(idGenerator.nextLongId());
+        globalDictItem.setId(idGenerator.nextLongId() + "");
         globalDictItem.setDeletedFlag(GlobalDeletedFlag.NORMAL);
         globalDictItem.setStatus(GlobalDictItemStatus.NORMAL);
         globalDictItem.setCreateUserId(TokenData.takeFromRequest().getUserId());

common/common-dict/src/main/java/com/ankaibei/workFlow/common/dict/service/impl/GlobalDictServiceImpl.java

@@ -58,9 +58,9 @@ public class GlobalDictServiceImpl extends BaseService<GlobalDict, Long> impleme
     @Transactional(rollbackFor = Exception.class)
     @Override
     public GlobalDict saveNew(GlobalDict globalDict) {
-        globalDict.setDictId(idGenerator.nextLongId());
+        globalDict.setDictId(idGenerator.nextLongId() + "");
         globalDict.setDeletedFlag(GlobalDeletedFlag.NORMAL);
-        globalDict.setCreateUserId(TokenData.takeFromRequest().getUserId());
+        globalDict.setCreateUserId(TokenData.takeFromRequest().getUserId() + "");
         globalDict.setUpdateUserId(globalDict.getCreateUserId());
         globalDict.setCreateTime(new Date());
         globalDict.setUpdateTime(globalDict.getCreateTime());
@@ -74,7 +74,7 @@ public class GlobalDictServiceImpl extends BaseService<GlobalDict, Long> impleme
         this.removeCache(originalGlobalDict.getDictCode());
         globalDict.setCreateUserId(originalGlobalDict.getCreateUserId());
         globalDict.setCreateTime(originalGlobalDict.getCreateTime());
-        globalDict.setUpdateUserId(TokenData.takeFromRequest().getUserId());
+        globalDict.setUpdateUserId(TokenData.takeFromRequest().getUserId() + "");
         globalDict.setUpdateTime(new Date());
         if (globalDictMapper.updateById(globalDict) != 1) {
             return false;

common/common-dict/src/main/java/com/ankaibei/workFlow/common/dict/service/impl/TenantGlobalDictItemServiceImpl.java

@@ -59,7 +59,7 @@ public class TenantGlobalDictItemServiceImpl
         if (!dict.getTenantCommon()) {
             dictItem.setTenantId(TokenData.takeFromRequest().getTenantId());
         }
-        dictItem.setId(idGenerator.nextLongId());
+        dictItem.setId(idGenerator.nextLongId() + "");
         dictItem.setDeletedFlag(GlobalDeletedFlag.NORMAL);
         dictItem.setStatus(GlobalDictItemStatus.NORMAL);
         dictItem.setCreateUserId(TokenData.takeFromRequest().getUserId());

common/common-dict/src/main/java/com/ankaibei/workFlow/common/dict/service/impl/TenantGlobalDictServiceImpl.java

@@ -64,9 +64,9 @@ public class TenantGlobalDictServiceImpl
     @Transactional(rollbackFor = Exception.class)
     @Override
     public TenantGlobalDict saveNew(TenantGlobalDict dict) {
-        dict.setDictId(idGenerator.nextLongId());
+        dict.setDictId(idGenerator.nextLongId() + "");
         dict.setDeletedFlag(GlobalDeletedFlag.NORMAL);
-        dict.setCreateUserId(TokenData.takeFromRequest().getUserId());
+        dict.setCreateUserId(TokenData.takeFromRequest().getUserId() + "");
         dict.setUpdateUserId(dict.getCreateUserId());
         dict.setCreateTime(new Date());
         dict.setUpdateTime(dict.getCreateTime());
@@ -80,7 +80,7 @@ public class TenantGlobalDictServiceImpl
         this.removeGlobalDictAllCache(originalDict);
         dict.setCreateUserId(originalDict.getCreateUserId());
         dict.setCreateTime(originalDict.getCreateTime());
-        dict.setUpdateUserId(TokenData.takeFromRequest().getUserId());
+        dict.setUpdateUserId(TokenData.takeFromRequest().getUserId() + "");
         dict.setUpdateTime(new Date());
         if (tenantGlobalDictMapper.updateById(dict) != 1) {
             return false;

common/common-dict/src/main/java/com/ankaibei/workFlow/common/dict/vo/GlobalDictItemVo.java

@@ -20,7 +20,7 @@ public class GlobalDictItemVo {
      * 主键Id。
      */
     @ApiModelProperty(value = "主键Id")
-    private Long id;
+    private String id;
 
     /**
      * 字典编码。
@@ -56,7 +56,7 @@ public class GlobalDictItemVo {
      * 创建用户Id。
      */
     @ApiModelProperty(value = "创建用户Id")
-    private Long createUserId;
+    private String createUserId;
 
     /**
      * 创建时间。
@@ -68,7 +68,7 @@ public class GlobalDictItemVo {
      * 创建用户名。
      */
     @ApiModelProperty(value = "创建用户名")
-    private Long updateUserId;
+    private String updateUserId;
 
     /**
      * 更新时间。

common/common-dict/src/main/java/com/ankaibei/workFlow/common/dict/vo/GlobalDictVo.java

@@ -20,7 +20,7 @@ public class GlobalDictVo {
      * 主键Id。
      */
     @ApiModelProperty(value = "主键Id")
-    private Long dictId;
+    private String dictId;
 
     /**
      * 字典编码。
@@ -38,7 +38,7 @@ public class GlobalDictVo {
      * 创建用户Id。
      */
     @ApiModelProperty(value = "创建用户Id")
-    private Long createUserId;
+    private String createUserId;
 
     /**
      * 创建时间。
@@ -50,7 +50,7 @@ public class GlobalDictVo {
      * 创建用户名。
      */
     @ApiModelProperty(value = "创建用户名")
-    private Long updateUserId;
+    private String updateUserId;
 
     /**
      * 更新时间。

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

@@ -290,7 +290,6 @@ public class FlowOnlineOperationController {
         }
         OnlineDatasource datasource = datasourceResult.getData();
         OnlineTable masterTable = datasource.getMasterTable();
-        Long datasourceId = datasource.getDatasourceId();
         ProcessInstance instance = flowApiService.getProcessInstance(processInstanceId);
         String dataId = instance.getBusinessKey();
         // 这里把传阅数据放到任务变量中，是为了避免给流程数据操作方法增加额外的方法调用参数。
@@ -303,7 +302,7 @@ public class FlowOnlineOperationController {
         FlowTaskComment flowTaskComment = BeanUtil.copyProperties(flowTaskCommentDto, FlowTaskComment.class);
         if (StrUtil.isBlank(dataId)) {
             return this.submitNewTask(processInstanceId, taskId,
-                    flowTaskComment, taskVariableData, masterTable, masterData, slaveData, datasourceId);
+                    flowTaskComment, taskVariableData, masterTable, masterData, slaveData, datasource.getDatasourceId());
         }
         try {
             if (StrUtil.equals(flowTaskComment.getApprovalType(), FlowApprovalType.TRANSFER)) {
@@ -313,7 +312,7 @@ public class FlowOnlineOperationController {
                 }
             }
             flowOnlineOperationService.updateAndTakeTask(
-                    task, flowTaskComment, taskVariableData, masterTable, masterData, dataId, slaveData, datasourceId);
+                    task, flowTaskComment, taskVariableData, masterTable, masterData, dataId, slaveData, datasource.getDatasourceId());
         } catch (FlowOperationException e) {
             log.error("Failed to call [FlowOnlineOperationService.updateAndTakeTask]", e);
             return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, e.getMessage());
@@ -350,15 +349,14 @@ public class FlowOnlineOperationController {
         if (StrUtil.isBlank(flowWorkOrderExt.getDraftData())) {
             return ResponseResult.success(null);
         }
-        Long tableId = flowWorkOrder.getOnlineTableId();
-        OnlineTable masterTable = onlineTableService.getOnlineTableFromCache(tableId);
+        OnlineTable masterTable = onlineTableService.getOnlineTableFromCache(flowWorkOrder.getOnlineTableId());
         JSONObject draftData = JSON.parseObject(flowWorkOrderExt.getDraftData());
         JSONObject masterData = draftData.getJSONObject(FlowConstant.MASTER_DATA_KEY);
         JSONObject slaveData = draftData.getJSONObject(FlowConstant.SLAVE_DATA_KEY);
         List<OnlineDatasourceRelation> slaveRelationList = null;
         if (slaveData != null) {
             OnlineDatasource datasource =
-                    onlineDatasourceService.getOnlineDatasourceByMasterTableId(tableId);
+                    onlineDatasourceService.getOnlineDatasourceByMasterTableId(flowWorkOrder.getOnlineTableId());
             ResponseResult<List<OnlineDatasourceRelation>> relationListResult =
                     onlineOperationHelper.verifyAndGetRelationList(datasource.getDatasourceId(), null);
             if (!relationListResult.isSuccess()) {
@@ -509,9 +507,8 @@ public class FlowOnlineOperationController {
             errorMessage = "数据验证失败，当前消息为所属流程实例没有包含业务主键Id！";
             return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
         }
-        Long formId = Long.valueOf(flowMessage.getBusinessDataShot());
         // 验证在线表单及其关联数据源的合法性。
-        ResponseResult<OnlineDatasource> datasourceResult = this.verifyAndGetOnlineDatasource(formId);
+        ResponseResult<OnlineDatasource> datasourceResult = this.verifyAndGetOnlineDatasource(flowMessage.getBusinessDataShot());
         if (!datasourceResult.isSuccess()) {
             return ResponseResult.errorFrom(datasourceResult);
         }
@@ -524,7 +521,7 @@ public class FlowOnlineOperationController {
         JSONObject jsonData = this.buildUserTaskData(
                 instance.getBusinessKey(), datasource.getMasterTable(), relationListResult.getData());
         // 将当前消息更新为已读
-        flowMessageService.readCopyTask(messageId);
+        flowMessageService.readCopyTask(messageId + "");
         return ResponseResult.success(jsonData);
     }
 
@@ -595,7 +592,7 @@ public class FlowOnlineOperationController {
             return;
         }
         ResponseResult<OnlineTable> verifyTableResult =
-                this.verifyAndGetOnlineTable(datasourceId, relationId, null, null);
+                this.verifyAndGetOnlineTable(datasourceId + "", relationId + "", null, null);
         if (!verifyTableResult.isSuccess()) {
             ResponseResult.output(HttpServletResponse.SC_FORBIDDEN, ResponseResult.errorFrom(verifyTableResult));
             return;
@@ -640,7 +637,7 @@ public class FlowOnlineOperationController {
             return;
         }
         ResponseResult<OnlineTable> verifyTableResult =
-                this.verifyAndGetOnlineTable(datasourceId, relationId, verifyResult.getData(), dataId);
+                this.verifyAndGetOnlineTable(datasourceId + "", relationId + "", verifyResult.getData(), dataId);
         if (!verifyTableResult.isSuccess()) {
             ResponseResult.output(HttpServletResponse.SC_FORBIDDEN, ResponseResult.errorFrom(verifyTableResult));
             return;
@@ -658,9 +655,9 @@ public class FlowOnlineOperationController {
         List<FlowEntry> flowEntryList = flowEntryService.getAllList();
         List<FlowEntryVo> flowEntryVoList = FlowEntry.INSTANCE.fromModelList(flowEntryList);
         if (CollUtil.isNotEmpty(flowEntryVoList)) {
-            Set<Long> pageIdSet = flowEntryVoList.stream().map(FlowEntryVo::getPageId).collect(Collectors.toSet());
+            Set<String> pageIdSet = flowEntryVoList.stream().map(FlowEntryVo::getPageId).collect(Collectors.toSet());
             List<OnlineForm> formList = onlineFormService.getOnlineFormListByPageIds(pageIdSet);
-            Map<Long, List<OnlineForm>> formMap =
+            Map<String, List<OnlineForm>> formMap =
                     formList.stream().collect(Collectors.groupingBy(OnlineForm::getPageId));
             for (FlowEntryVo flowEntryVo : flowEntryVoList) {
                 List<OnlineForm> flowEntryFormList = formMap.get(flowEntryVo.getPageId());
@@ -670,7 +667,7 @@ public class FlowOnlineOperationController {
         return ResponseResult.success(flowEntryVoList);
     }
 
-    private ResponseResult<OnlineDatasource> verifyAndGetOnlineDatasource(Long formId) {
+    private ResponseResult<OnlineDatasource> verifyAndGetOnlineDatasource(String formId) {
         List<OnlineFormDatasource> formDatasourceList = onlineFormService.getFormDatasourceListFromCache(formId);
         if (CollUtil.isEmpty(formDatasourceList)) {
             String errorMessage = "数据验证失败，流程任务绑定的在线表单Id [" + formId + "] 不存在，请修改流程图！";
@@ -733,10 +730,10 @@ public class FlowOnlineOperationController {
             }
         }
         if (slaveData != null && relationList != null) {
-            Map<Long, OnlineDatasourceRelation> relationMap =
+            Map<String, OnlineDatasourceRelation> relationMap =
                     relationList.stream().collect(Collectors.toMap(OnlineDatasourceRelation::getRelationId, c -> c));
             for (Map.Entry<String, Object> entry : slaveData.entrySet()) {
-                OnlineDatasourceRelation relation = relationMap.get(Long.valueOf(entry.getKey()));
+                OnlineDatasourceRelation relation = relationMap.get(entry.getKey());
                 if (relation == null) {
                     continue;
                 }
@@ -779,7 +776,7 @@ public class FlowOnlineOperationController {
             OnlineTable masterTable,
             JSONObject masterData,
             JSONObject slaveData,
-            Long datasourceId) {
+            String datasourceId) {
         ResponseResult<List<ColumnData>> columnDataListResult =
                 onlineOperationHelper.buildTableData(masterTable, masterData, false, null);
         if (!columnDataListResult.isSuccess()) {
@@ -814,7 +811,7 @@ public class FlowOnlineOperationController {
     }
 
     private ResponseResult<OnlineTable> verifyAndGetOnlineTable(
-            Long datasourceId, Long relationId, String businessKey, String dataId) {
+            String datasourceId, String relationId, String businessKey, String dataId) {
         ResponseResult<OnlineDatasource> datasourceResult =
                 onlineOperationHelper.verifyAndGetDatasource(datasourceId);
         if (!datasourceResult.isSuccess()) {
@@ -907,7 +904,7 @@ public class FlowOnlineOperationController {
         }
         List<OnlinePageDatasource> datasourceList =
                 onlinePageService.getOnlinePageDatasourceListByPageId(flowEntry.getPageId());
-        Optional<Long> r = datasourceList.stream()
+        Optional<String> r = datasourceList.stream()
                 .map(OnlinePageDatasource::getDatasourceId).filter(c -> c.equals(datasourceId)).findFirst();
         if (!r.isPresent()) {
             errorMessage = "数据验证失败，当前数据源Id并不属于当前流程！";
@@ -932,7 +929,7 @@ public class FlowOnlineOperationController {
         Set<String> businessKeySet = flowWorkOrderVoList.stream()
                 .filter(c -> c.getBusinessKey() != null)
                 .map(FlowWorkOrderVo::getBusinessKey).collect(Collectors.toSet());
-        Long tableId = flowWorkOrderVoList.get(0).getOnlineTableId();
+        String tableId = flowWorkOrderVoList.get(0).getOnlineTableId();
         OnlineTable masterTable = onlineTableService.getOnlineTableFromCache(tableId);
         if (CollUtil.isNotEmpty(businessKeySet)) {
             Set<?> convertedBusinessKeySet =
@@ -974,11 +971,11 @@ public class FlowOnlineOperationController {
         List<FlowWorkOrderVo> draftWorkOrderList = flowWorkOrderVoList.stream()
                 .filter(c -> c.getFlowStatus().equals(FlowTaskStatus.DRAFT)).collect(Collectors.toList());
         if (CollUtil.isNotEmpty(draftWorkOrderList)) {
-            Set<Long> workOrderIdSet = draftWorkOrderList.stream()
+            Set<String> workOrderIdSet = draftWorkOrderList.stream()
                     .map(FlowWorkOrderVo::getWorkOrderId).collect(Collectors.toSet());
             List<FlowWorkOrderExt> workOrderExtList =
                     flowWorkOrderService.getFlowWorkOrderExtByWorkFlowIds(workOrderIdSet);
-            Map<Long, FlowWorkOrderExt> workOrderExtMap = workOrderExtList.stream()
+            Map<String, FlowWorkOrderExt> workOrderExtMap = workOrderExtList.stream()
                     .collect(Collectors.toMap(FlowWorkOrderExt::getWorkOrderId, c -> c));
             for (FlowWorkOrderVo workOrder : draftWorkOrderList) {
                 FlowWorkOrderExt workOrderExt = workOrderExtMap.get(workOrder.getWorkOrderId());