Merge branch 'master' of http://124.70.58.209:3000/buzhanyi/ankaibeiProjectManagement

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

@@ -5,8 +5,8 @@ import com.ankaibei.workFlow.webadmin.ankaibei.enums.CodeEnum;
 import com.ankaibei.workFlow.webadmin.ankaibei.service.ApplyForCostService;
 import com.ankaibei.workFlow.webadmin.ankaibei.service.impl.FileUtil;
 import com.ankaibei.workFlow.webadmin.ankaibei.vo.*;
+import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -43,7 +43,7 @@ public class ApplyForCostController {
     @CrossOrigin
     @RequestMapping("/invoiceUpLoad")
     public ResMsg invoiceUpLoad(@RequestParam(value = "invoicesList", required = false) List<MultipartFile> invoicesList) {
-        if (!StringUtils.isEmpty(invoicesList)) {
+        if (ObjectUtils.isNotEmpty(invoicesList)) {
             List<String> strings = fileUtil.uploadList(invoicesList);
             if (strings != null) {
                 return new ResMsg(CodeEnum.OK, strings.toString());

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

@@ -40,6 +40,7 @@ import com.ankaibei.workFlow.webadmin.ankaibei.utils.FlowTaskStart;
 import com.ankaibei.workFlow.webadmin.ankaibei.vo.CostInfoVo;
 import com.ankaibei.workFlow.webadmin.ankaibei.vo.ResMsg;
 import com.ankaibei.workFlow.webadmin.ankaibei.vo.UserInfoVo;
+import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.flowable.engine.runtime.ProcessInstance;
 import org.flowable.task.api.Task;
@@ -54,6 +55,7 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -183,24 +185,24 @@ public class CostInfoController {
             //拿到任务所在表单中数据字段和对应的值(包含每个申请记录的项目名称和流程的任务变量)
             JSONObject jsonData = viewUserTaskDatasource(taskVo.getProcessInstanceId(), taskVo.getTaskId()).getData();
             Map<String, Object> masterAndOneToOne = (Map<String, Object>) jsonData.get("masterAndOneToOne");
-            if (masterAndOneToOne.get("project_id") != null) {
+            if (ObjectUtils.isNotEmpty(masterAndOneToOne.get("project_id"))) {
                 Integer projectId = Integer.parseInt(masterAndOneToOne.get("project_id").toString());
                 taskVo.setProjectId(projectId);
                 String projectName = projectInfoFlowMapper.getById(projectId).getProjectName();
                 taskVo.setProjectName(projectName == null ? "" : projectName);
-            } else if (masterAndOneToOne.get("project_name") != null) {
+            } else if (ObjectUtils.isNotEmpty(masterAndOneToOne.get("project_name"))) {
                 Integer projectId = Integer.parseInt(masterAndOneToOne.get("project_name").toString());
                 ProjectInfoEntityOfFlow byId = projectInfoFlowMapper.getById(projectId);
-                if (byId != null) {
+                if (ObjectUtils.isNotEmpty(byId)) {
                     taskVo.setProjectId(projectId);
                     taskVo.setProjectName(byId.getProjectName());
                 }
             }
-            if (masterAndOneToOne.get("total_money") != null) {
+            if (ObjectUtils.isNotEmpty(masterAndOneToOne.get("total_money"))) {
                 taskVo.setApplicationFee(masterAndOneToOne.get("total_money").toString());
             }
             //取每条费用申请记录中的费用项，费用类型的直接取，工时和新建项目使用流程分类名称即可
-            if (masterAndOneToOne.get("cost_type") != null) {
+            if (ObjectUtils.isNotEmpty(masterAndOneToOne.get("cost_type"))) {
                 taskVo.setCostType(masterAndOneToOne.get("cost_type").toString());
             } else {
                 taskVo.setCostType(categoryName);
@@ -237,7 +239,7 @@ public class CostInfoController {
         MyPageData<Task> pageDataTwo = flowApiService.getTaskListByUserName(username, listRuntimeTaskRequestVo);
         List<FlowTaskVo> flowTaskVoList = flowApiService.convertToFlowTaskList(pageDataTwo.getDataList());
         String queryType = "费用报销";
-        return PackageAgain(flowTaskVoList, pageNum, queryType);
+        return PackageAgain(flowTaskVoList, queryType, listRuntimeTaskRequestVo);
     }
 
 
@@ -262,7 +264,7 @@ public class CostInfoController {
         MyPageData<Task> pageDataTwo = flowApiService.getTaskListByUserName(username, listRuntimeTaskRequestVo);
         List<FlowTaskVo> flowTaskVoList = flowApiService.convertToFlowTaskList(pageDataTwo.getDataList());
         String queryType = "人员工时";
-        return PackageAgain(flowTaskVoList, pageNum, queryType);
+        return PackageAgain(flowTaskVoList, queryType, listRuntimeTaskRequestVo);
     }
 
     /**
@@ -284,7 +286,7 @@ public class CostInfoController {
         MyPageData<Task> pageDataTwo = flowApiService.getTaskListByUserName(TokenData.takeFromRequest().getLoginName(), listRuntimeTaskRequestVo);
         List<FlowTaskVo> flowTaskVoList = flowApiService.convertToFlowTaskList(pageDataTwo.getDataList());
         String queryType = "新建项目";
-        return PackageAgain(flowTaskVoList, pageNum, queryType);
+        return PackageAgain(flowTaskVoList, queryType, listRuntimeTaskRequestVo);
     }
 
     /**
@@ -307,7 +309,7 @@ public class CostInfoController {
         MyPageData<Task> pageDataTwo = flowApiService.getTaskListByUserName(username, listRuntimeTaskRequestVo);
         List<FlowTaskVo> flowTaskVoList = flowApiService.convertToFlowTaskList(pageDataTwo.getDataList());
         String queryType = "新建任务";
-        return PackageAgain(flowTaskVoList, pageNum, queryType);
+        return PackageAgain(flowTaskVoList, queryType, listRuntimeTaskRequestVo);
     }
 
     /**
@@ -389,19 +391,20 @@ public class CostInfoController {
     }
 
 
-    private ResMsg PackageAgain(List<FlowTaskVo> flowTaskVoList, Integer pageNum, String queryType) {
+    private ResMsg PackageAgain(List<FlowTaskVo> flowTaskVoList, String queryType, ListRuntimeTaskRequestVo listRuntimeTaskRequestVo) {
+        Integer pageNum = listRuntimeTaskRequestVo.getPageNum();
         //---从所有的任务里取出一个分类的任务
         //先拿到任务所在的全部流程
         List<FlowTaskVo> flowTaskVoListByQueryType = new ArrayList<>();
-        Set<Long> entryIdList = new HashSet<>();
+        Set<String> entryIdList = new HashSet<>();
         for (FlowTaskVo taskVo : flowTaskVoList) {
-            entryIdList.add(Long.valueOf(taskVo.getEntryId()));
+            entryIdList.add(taskVo.getEntryId());
         }
         List<FlowEntry> entryList = flowEntryService.getInList(entryIdList);
         //获取流程所在的分类
-        Set<Long> categoryIdList = new HashSet<>();
+        Set<String> categoryIdList = new HashSet<>();
         for (FlowEntry entry : entryList) {
-            categoryIdList.add(Long.valueOf(entry.getCategoryId()));
+            categoryIdList.add(entry.getCategoryId());
         }
         List<FlowCategory> flowCategoryList = categoryService.getInList(categoryIdList);
         //给流程任务对象的流程分类字段赋值
@@ -424,61 +427,57 @@ public class CostInfoController {
         if (flowTaskVoListByQueryType.size() < 1) {
             return ResMsg.newInstance(CodeEnum.OK, MyPageUtil.makeResponseData(flowTaskVoListByQueryType, Long.valueOf(flowTaskVoListByQueryType.size())));
         }
-        List<FlowTaskVo> flowTaskVoListByQueryTypeRsg = new ArrayList<>();
-        if (pageNum == 1) {
-            for (int i = 0; i < 10; i++) {
-                flowTaskVoListByQueryTypeRsg.add(flowTaskVoListByQueryType.get(i));
-                if (i == flowTaskVoListByQueryType.size() - 1) {
-                    break;
-                }
-            }
-        } else {
-            for (int i = (pageNum - 1) * 10; i < pageNum * 10 - 1; i++) {
-                flowTaskVoListByQueryTypeRsg.add(flowTaskVoListByQueryType.get(i));
-                if (i == flowTaskVoListByQueryType.size() - 1) {
-                    break;
-                }
-            }
-        }
         //获取任务中的全部项目id和流程实例id
+        Map<String, Object> byTaskAdd = new HashMap<>();
         Set<Integer> projectIds = new HashSet<>();
         Set<String> processInstanceIds = new HashSet<>();
-        //查询的任务分类是新建项目时，需要筛选新建项目的表单数据
-        if (queryType.equals("新建项目")) {
-            Map<String, Object> byTaskAdd = flowTaskAssignmentByProjectAdd(flowTaskVoListByQueryTypeRsg, queryType);
-            projectIds = (Set<Integer>) byTaskAdd.get("projectIds");
-            processInstanceIds = (Set<String>) byTaskAdd.get("processInstanceIds");
-            flowTaskVoListByQueryTypeRsg = (List<FlowTaskVo>) byTaskAdd.get("flowTaskVoListByQueryTypeRsg");
-        }
-        //查询的任务分类是新建项目任务时，需要筛选新建任务的表单数据
-        if (queryType.equals("新建任务")) {
-            Map<String, Object> byTaskAdd = flowTaskAssignmentByTaskAdd(flowTaskVoListByQueryTypeRsg, queryType);
-            projectIds = (Set<Integer>) byTaskAdd.get("projectIds");
-            processInstanceIds = (Set<String>) byTaskAdd.get("processInstanceIds");
-            flowTaskVoListByQueryTypeRsg = (List<FlowTaskVo>) byTaskAdd.get("flowTaskVoListByQueryTypeRsg");
-        }
-        //查询的任务分类是人员工时时，需要筛选人员工时的表单数据
-        if (queryType.equals("人员工时")) {
-            Map<String, Object> byTaskAdd = flowTaskAssignmentByManhour(flowTaskVoListByQueryTypeRsg, queryType);
-            projectIds = (Set<Integer>) byTaskAdd.get("projectIds");
-            processInstanceIds = (Set<String>) byTaskAdd.get("processInstanceIds");
-            flowTaskVoListByQueryTypeRsg = (List<FlowTaskVo>) byTaskAdd.get("flowTaskVoListByQueryTypeRsg");
+        switch (queryType) {
+            case "新建项目":
+                //查询的任务分类是新建项目时，需要筛选新建项目的表单数据
+                byTaskAdd = flowTaskAssignmentByProjectAdd(flowTaskVoListByQueryType, queryType);
+                projectIds = (Set<Integer>) byTaskAdd.get("projectIds");
+                processInstanceIds = (Set<String>) byTaskAdd.get("processInstanceIds");
+                flowTaskVoListByQueryType = (List<FlowTaskVo>) byTaskAdd.get("flowTaskVoListByQueryTypePro");
+                break;
+            case "新建任务":
+                //查询的任务分类是新建项目任务时，需要筛选新建任务的表单数据
+                byTaskAdd = flowTaskAssignmentByTaskAdd(flowTaskVoListByQueryType, queryType);
+                projectIds = (Set<Integer>) byTaskAdd.get("projectIds");
+                processInstanceIds = (Set<String>) byTaskAdd.get("processInstanceIds");
+                flowTaskVoListByQueryType.clear();
+                flowTaskVoListByQueryType = (List<FlowTaskVo>) byTaskAdd.get("flowTaskVoListByQueryTypePro");
+                break;
+            case "人员工时":
+                //查询的任务分类是人员工时时，需要筛选人员工时的表单数据
+                byTaskAdd = flowTaskAssignmentByManhour(flowTaskVoListByQueryType, queryType);
+                projectIds = (Set<Integer>) byTaskAdd.get("projectIds");
+                processInstanceIds = (Set<String>) byTaskAdd.get("processInstanceIds");
+                flowTaskVoListByQueryType.clear();
+                flowTaskVoListByQueryType = (List<FlowTaskVo>) byTaskAdd.get("flowTaskVoListByQueryTypePro");
+                break;
+            case "费用报销":
+                //查询的任务分类是费用报销时，需要筛选费用报销的表单数据
+                byTaskAdd = flowTaskAssignmentByExpense(flowTaskVoListByQueryType, queryType);
+                projectIds = (Set<Integer>) byTaskAdd.get("projectIds");
+                processInstanceIds = (Set<String>) byTaskAdd.get("processInstanceIds");
+                flowTaskVoListByQueryType.clear();
+                flowTaskVoListByQueryType = (List<FlowTaskVo>) byTaskAdd.get("flowTaskVoListByQueryTypePro");
+                break;
+            default:
+                break;
         }
-        //查询的任务分类是费用报销时，需要筛选费用报销的表单数据
-        if (queryType.equals("费用报销")) {
-            Map<String, Object> byTaskAdd = flowTaskAssignmentByExpense(flowTaskVoListByQueryTypeRsg, queryType);
-            projectIds = (Set<Integer>) byTaskAdd.get("projectIds");
-            processInstanceIds = (Set<String>) byTaskAdd.get("processInstanceIds");
-            flowTaskVoListByQueryTypeRsg = (List<FlowTaskVo>) byTaskAdd.get("flowTaskVoListByQueryTypeRsg");
+        //重新进行包装分页
+        if (flowTaskVoListByQueryType.size() < 1) {
+            return ResMsg.newInstance(CodeEnum.OK, MyPageUtil.makeResponseData(flowTaskVoListByQueryType, Long.valueOf(flowTaskVoListByQueryType.size())));
         }
         //查询到任务信息中包含的全部项目和表单数据
         List<ProjectInfoEntity> projectInfos = projectInfoMapper.findAllById(projectIds);
         List<FlowWorkOrder> instanceIdIn = flowWorkOrderService.findAllByProcessInstanceIdIn(processInstanceIds);
-        for (FlowTaskVo taskVo : flowTaskVoListByQueryTypeRsg) {
+        //匹配项目名称和流程实例发起人
+        for (FlowTaskVo taskVo : flowTaskVoListByQueryType) {
             for (ProjectInfoEntity info : projectInfos) {
                 if (info.getProjectId().equals(taskVo.getProjectId())) {
                     taskVo.setProjectName(info.getProjectName() == null ? "" : info.getProjectName());
-                    break;
                 }
             }
             for (FlowWorkOrder order : instanceIdIn) {
@@ -487,23 +486,49 @@ public class CostInfoController {
                     String showName = userInfoMapper.findByLoginNameEqualsAndDeletedFlagIs(order.getSubmitUsername(), 1).getShowName();
                     taskVo.setShowName(showName == null ? "" : showName);
                     taskVo.setFlowTaskStatus(order.getFlowStatus() + "");
+                }
+            }
+        }
+        //项目名称筛选
+        List<FlowTaskVo> flowTaskVoListByQueryTypePro = new ArrayList<>();
+        if (ObjectUtils.isNotEmpty(listRuntimeTaskRequestVo.getProjectName())) {
+            for (int i = 0; i < flowTaskVoListByQueryType.size(); i++) {
+                if (flowTaskVoListByQueryType.get(i).getProjectName().contains(listRuntimeTaskRequestVo.getProjectName())) {
+                    flowTaskVoListByQueryTypePro.add(flowTaskVoListByQueryType.get(i));
+                }
+            }
+        } else {
+            flowTaskVoListByQueryTypePro.addAll(flowTaskVoListByQueryType);
+        }
+        List<FlowTaskVo> flowTaskVoListByQueryTypeRsg = new ArrayList<>();
+        //将处理完的数据构成分页数据
+        if (pageNum == 1) {
+            for (int i = 0; i < 10; i++) {
+                flowTaskVoListByQueryTypeRsg.add(flowTaskVoListByQueryTypePro.get(i));
+                if (i == flowTaskVoListByQueryTypePro.size() - 1) {
+                    break;
+                }
+            }
+        } else {
+            for (int i = (pageNum - 1) * 10; i < pageNum * 10 - 1; i++) {
+                flowTaskVoListByQueryTypeRsg.add(flowTaskVoListByQueryTypePro.get(i));
+                if (i == flowTaskVoListByQueryTypePro.size() - 1) {
                     break;
                 }
             }
         }
-
         return ResMsg.newInstance(CodeEnum.OK, MyPageUtil.makeResponseData(flowTaskVoListByQueryTypeRsg, Long.valueOf(flowTaskVoListByQueryType.size())));
     }
 
     //查询的任务分类是新建项目时，需要筛选项目流程记录的表单数据
-    private Map<String, Object> flowTaskAssignmentByProjectAdd(List<FlowTaskVo> flowTaskVoListByQueryTypeRsg, String queryType) {
+    private Map<String, Object> flowTaskAssignmentByProjectAdd(List<FlowTaskVo> flowTaskVoListByQueryTypePro, String queryType) {
         Set<Integer> projectIds = new HashSet<>();
         Set<String> processInstanceIds = new HashSet<>();
-        for (FlowTaskVo taskVo : flowTaskVoListByQueryTypeRsg) {
+        for (FlowTaskVo taskVo : flowTaskVoListByQueryTypePro) {
             Integer projectId = null;
             JSONObject jsonData = viewUserTaskDatasource(taskVo.getProcessInstanceId(), taskVo.getTaskId()).getData();
             Map<String, Object> masterAndOneToOne = (Map<String, Object>) jsonData.get("masterAndOneToOne");
-            if (masterAndOneToOne.get("project_id") != null) {
+            if (ObjectUtils.isNotEmpty(masterAndOneToOne.get("project_id"))) {
                 projectId = Integer.parseInt(masterAndOneToOne.get("project_id").toString());
                 taskVo.setProjectId(projectId);
             }
@@ -515,24 +540,24 @@ public class CostInfoController {
         Map<String, Object> map = new HashMap<>();
         map.put("projectIds", projectIds);
         map.put("processInstanceIds", processInstanceIds);
-        map.put("flowTaskVoListByQueryTypeRsg", flowTaskVoListByQueryTypeRsg);
+        map.put("flowTaskVoListByQueryTypePro", flowTaskVoListByQueryTypePro);
         return map;
     }
 
     //查询的任务分类是新建项目任务时，需要筛选新建任务的表单数据
-    private Map<String, Object> flowTaskAssignmentByTaskAdd(List<FlowTaskVo> flowTaskVoListByQueryTypeRsg, String queryType) {
+    private Map<String, Object> flowTaskAssignmentByTaskAdd(List<FlowTaskVo> flowTaskVoListByQueryTypePro, String queryType) {
         Set<Integer> projectIds = new HashSet<>();
         Set<String> processInstanceIds = new HashSet<>();
-        for (FlowTaskVo taskVo : flowTaskVoListByQueryTypeRsg) {
+        for (FlowTaskVo taskVo : flowTaskVoListByQueryTypePro) {
             Integer projectId = null;
             JSONObject jsonData = viewUserTaskDatasource(taskVo.getProcessInstanceId(), taskVo.getTaskId()).getData();
             Map<String, Object> masterAndOneToOne = (Map<String, Object>) jsonData.get("masterAndOneToOne");
-            if (masterAndOneToOne.get("project_id") != null) {
+            if (ObjectUtils.isNotEmpty(masterAndOneToOne.get("project_id"))) {
                 projectId = Integer.parseInt(masterAndOneToOne.get("project_id").toString());
                 taskVo.setProjectId(projectId);
             }
             //新建任务分类中，获取的项目任务的id
-            if (masterAndOneToOne.get("task_id") != null) {
+            if (ObjectUtils.isNotEmpty(masterAndOneToOne.get("task_id"))) {
                 taskVo.setApplyDataId(Integer.parseInt(masterAndOneToOne.get("task_id").toString()));
             }
             taskVo.setCostType(queryType);
@@ -543,24 +568,24 @@ public class CostInfoController {
         Map<String, Object> map = new HashMap<>();
         map.put("projectIds", projectIds);
         map.put("processInstanceIds", processInstanceIds);
-        map.put("flowTaskVoListByQueryTypeRsg", flowTaskVoListByQueryTypeRsg);
+        map.put("flowTaskVoListByQueryTypePro", flowTaskVoListByQueryTypePro);
         return map;
     }
 
-    //查询的任务分类是新建项目任务时，需要筛选新建任务的表单数据
-    private Map<String, Object> flowTaskAssignmentByManhour(List<FlowTaskVo> flowTaskVoListByQueryTypeRsg, String queryType) {
+    //查询的任务分类是工时申请时，需要筛选工时申请的表单数据
+    private Map<String, Object> flowTaskAssignmentByManhour(List<FlowTaskVo> flowTaskVoListByQueryTypePro, String queryType) {
         Set<Integer> projectIds = new HashSet<>();
         Set<String> processInstanceIds = new HashSet<>();
-        for (FlowTaskVo taskVo : flowTaskVoListByQueryTypeRsg) {
+        for (FlowTaskVo taskVo : flowTaskVoListByQueryTypePro) {
             Integer projectId = null;
             JSONObject jsonData = viewUserTaskDatasource(taskVo.getProcessInstanceId(), taskVo.getTaskId()).getData();
             Map<String, Object> masterAndOneToOne = (Map<String, Object>) jsonData.get("masterAndOneToOne");
             //人员工时分类中，获取的项目id和工时流程表中保存的工时id
-            if (masterAndOneToOne.get("project_name") != null) {
+            if (ObjectUtils.isNotEmpty(masterAndOneToOne.get("project_name"))) {
                 projectId = Integer.parseInt(masterAndOneToOne.get("project_name").toString());
                 taskVo.setProjectId(projectId);
             }
-            if (masterAndOneToOne.get("man_id") != null) {
+            if (ObjectUtils.isNotEmpty(masterAndOneToOne.get("man_id"))) {
                 taskVo.setApplyDataId(Integer.parseInt(masterAndOneToOne.get("man_id").toString()));
             }
             taskVo.setCostType(queryType);
@@ -571,43 +596,43 @@ public class CostInfoController {
         Map<String, Object> map = new HashMap<>();
         map.put("projectIds", projectIds);
         map.put("processInstanceIds", processInstanceIds);
-        map.put("flowTaskVoListByQueryTypeRsg", flowTaskVoListByQueryTypeRsg);
+        map.put("flowTaskVoListByQueryTypePro", flowTaskVoListByQueryTypePro);
         return map;
     }
 
     //查询的任务分类是费用报销时，需要筛选费用报销的表单数据
-    private Map<String, Object> flowTaskAssignmentByExpense(List<FlowTaskVo> flowTaskVoListByQueryTypeRsg, String queryType) {
+    private Map<String, Object> flowTaskAssignmentByExpense(List<FlowTaskVo> flowTaskVoListByQueryTypePro, String queryType) {
         Set<Integer> projectIds = new HashSet<>();
         Set<String> processInstanceIds = new HashSet<>();
-        for (FlowTaskVo taskVo : flowTaskVoListByQueryTypeRsg) {
+        for (FlowTaskVo taskVo : flowTaskVoListByQueryTypePro) {
             Integer projectId = null;
             JSONObject jsonData = viewUserTaskDatasource(taskVo.getProcessInstanceId(), taskVo.getTaskId()).getData();
             Map<String, Object> masterAndOneToOne = (Map<String, Object>) jsonData.get("masterAndOneToOne");
             //获取的项目id
-            if (masterAndOneToOne.get("project_name") != null) {
+            if (ObjectUtils.isNotEmpty(masterAndOneToOne.get("project_name"))) {
                 projectId = Integer.parseInt(masterAndOneToOne.get("project_name").toString());
                 taskVo.setProjectId(projectId);
             }
             //费用报销分类中，获取费用申请记录流程表中的【申请费用，总价，住宿天数】
-            if (masterAndOneToOne.get("application_fee") != null) {
+            if (ObjectUtils.isNotEmpty(masterAndOneToOne.get("application_fee"))) {
                 taskVo.setApplicationFee(masterAndOneToOne.get("application_fee").toString());
             }
-            if (masterAndOneToOne.get("total_money") != null) {
+            if (ObjectUtils.isNotEmpty(masterAndOneToOne.get("total_money"))) {
                 taskVo.setApplicationFee(masterAndOneToOne.get("total_money").toString());
             }
-            if (masterAndOneToOne.get("accommodation_days") != null) {
+            if (ObjectUtils.isNotEmpty(masterAndOneToOne.get("accommodation_days"))) {
                 taskVo.setAccommodationDays(masterAndOneToOne.get("accommodation_days").toString());
             }
             //费用报销分类中，每个审批项在各自记录表中的主键id
-            if (masterAndOneToOne.get("id") != null) {
+            if (ObjectUtils.isNotEmpty(masterAndOneToOne.get("id"))) {
                 taskVo.setApplyDataId(Integer.parseInt(masterAndOneToOne.get("id").toString()));
-            } else if (masterAndOneToOne.get("communication_id") != null) {
+            } else if (ObjectUtils.isNotEmpty(masterAndOneToOne.get("communication_id"))) {
                 taskVo.setApplyDataId(Integer.parseInt(masterAndOneToOne.get("communication_id").toString()));
-            } else if (masterAndOneToOne.get("purchase_id") != null) {
+            } else if (ObjectUtils.isNotEmpty(masterAndOneToOne.get("purchase_id"))) {
                 taskVo.setApplyDataId(Integer.parseInt(masterAndOneToOne.get("purchase_id").toString()));
             }
             //费用报销分类中，每个审批项的费用类别
-            if (masterAndOneToOne.get("cost_type") != null) {
+            if (ObjectUtils.isNotEmpty(masterAndOneToOne.get("cost_type"))) {
                 taskVo.setCostType(masterAndOneToOne.get("cost_type").toString());
             }
             taskVo.setCategoryName(queryType);
@@ -617,7 +642,7 @@ public class CostInfoController {
         Map<String, Object> map = new HashMap<>();
         map.put("projectIds", projectIds);
         map.put("processInstanceIds", processInstanceIds);
-        map.put("flowTaskVoListByQueryTypeRsg", flowTaskVoListByQueryTypeRsg);
+        map.put("flowTaskVoListByQueryTypePro", flowTaskVoListByQueryTypePro);
         return map;
     }
 }

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

@@ -25,6 +25,7 @@ import com.ankaibei.workFlow.webadmin.ankaibei.vo.ProjectInfoVo;
 import com.ankaibei.workFlow.webadmin.ankaibei.vo.ResMsg;
 import com.ankaibei.workFlow.webadmin.upms.dao.SysDeptMapper;
 import com.ankaibei.workFlow.webadmin.upms.model.SysDept;
+import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
@@ -160,7 +161,7 @@ public class ProjectInfoServiceImpl implements ProjectInfoService {
         String initTaskInfo = flowEntryPublish.getInitTaskInfo();
         com.ankaibei.workFlow.common.flow.vo.TaskInfoVo taskInfo = StrUtil.isBlank(initTaskInfo)
                 ? null : JSON.parseObject(initTaskInfo, TaskInfoVo.class);
-        if (taskInfo != null) {
+        if (ObjectUtils.isNotEmpty(taskInfo)) {
             String loginName = TokenData.takeFromRequest().getLoginName();
             taskInfo.setAssignedMe(StrUtil.equalsAny(
                     taskInfo.getAssignee(), loginName, FlowConstant.START_USER_NAME_VAR));

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

@@ -160,7 +160,7 @@ public class TaskInfoServiceImpl implements TaskInfoService {
         String initTaskInfo = flowEntryPublish.getInitTaskInfo();
         com.ankaibei.workFlow.common.flow.vo.TaskInfoVo taskInfo = StrUtil.isBlank(initTaskInfo)
                 ? null : JSON.parseObject(initTaskInfo, com.ankaibei.workFlow.common.flow.vo.TaskInfoVo.class);
-        if (taskInfo != null) {
+        if (ObjectUtils.isNotEmpty(taskInfo)) {
             String loginName = TokenData.takeFromRequest().getLoginName();
             taskInfo.setAssignedMe(StrUtil.equalsAny(
                     taskInfo.getAssignee(), loginName, FlowConstant.START_USER_NAME_VAR));

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -25,6 +25,7 @@ import com.ankaibei.workFlow.webadmin.upms.service.SysDataPermService;
 import com.ankaibei.workFlow.webadmin.upms.service.SysDeptService;
 import com.ankaibei.workFlow.webadmin.upms.service.SysMenuService;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.ObjectUtils;
 import org.redisson.api.RBucket;
 import org.redisson.api.RedissonClient;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -43,7 +44,7 @@ import java.util.stream.Collectors;
  */
 @Slf4j
 @Service("sysDataPermService")
-public class SysDataPermServiceImpl extends BaseService<SysDataPerm, Long> implements SysDataPermService {
+public class SysDataPermServiceImpl extends BaseService<SysDataPerm, String> implements SysDataPermService {
 
     @Autowired
     private SysDataPermMapper sysDataPermMapper;
@@ -89,7 +90,7 @@ public class SysDataPermServiceImpl extends BaseService<SysDataPerm, Long> imple
     public boolean update(
             SysDataPerm dataPerm, SysDataPerm originalDataPerm, Set<String> deptIdSet, Set<String> menuIdSet) {
         MyModelUtil.fillCommonsForUpdate(dataPerm, originalDataPerm);
-        UpdateWrapper<SysDataPerm> uw = this.createUpdateQueryForNullValue(dataPerm, Long.valueOf(dataPerm.getDataPermId()));
+        UpdateWrapper<SysDataPerm> uw = this.createUpdateQueryForNullValue(dataPerm, dataPerm.getDataPermId());
         if (sysDataPermMapper.update(dataPerm, uw) != 1) {
             return false;
         }
@@ -202,18 +203,18 @@ public class SysDataPermServiceImpl extends BaseService<SysDataPerm, Long> imple
             }
             // 这里优先合并最复杂的多部门及子部门场景。
             String deptIds = processMultiDeptAndChildren(ruleMap, deptId);
-            if (deptIds != null) {
+            if (ObjectUtils.isNotEmpty(deptIds)) {
                 resultMap.put(DataPermRuleType.TYPE_MULTI_DEPT_AND_CHILD_DEPT, deptIds);
             }
             // 合并当前部门及子部门的优化
-            if (ruleMap.get(DataPermRuleType.TYPE_DEPT_AND_CHILD_DEPT) != null) {
+            if (ObjectUtils.isNotEmpty(ruleMap.get(DataPermRuleType.TYPE_DEPT_AND_CHILD_DEPT))) {
                 // 需要与仅仅当前部门规则进行合并。
                 ruleMap.remove(DataPermRuleType.TYPE_DEPT_ONLY);
                 resultMap.put(DataPermRuleType.TYPE_DEPT_AND_CHILD_DEPT, "null");
             }
             // 合并自定义部门了。
             deptIds = processMultiDept(ruleMap, deptId);
-            if (deptIds != null) {
+            if (ObjectUtils.isNotEmpty(deptIds)) {
                 resultMap.put(DataPermRuleType.TYPE_CUSTOM_DEPT_LIST, deptIds);
             }
             // 最后处理当前部门和当前用户。
@@ -309,16 +310,16 @@ public class SysDataPermServiceImpl extends BaseService<SysDataPerm, Long> imple
             if (StrUtil.isBlank(deptIdListString)) {
                 return CallResult.error("数据验证失败，部门列表不能为空！");
             }
-            Set<Long> deptIdSet = StrUtil.split(
-                    deptIdListString, ",").stream().map(Long::valueOf).collect(Collectors.toSet());
+            Set<String> deptIdSet = StrUtil.split(
+                    deptIdListString, ",").stream().map(String::valueOf).collect(Collectors.toSet());
             if (!sysDeptService.existAllPrimaryKeys(deptIdSet)) {
                 return CallResult.error("数据验证失败，存在不合法的部门数据，请刷新后重试！");
             }
             jsonObject.put("deptIdSet", deptIdSet);
         }
         if (StrUtil.isNotBlank(menuIdListString)) {
-            Set<Long> menuIdSet = StrUtil.split(
-                    menuIdListString, ",").stream().map(Long::valueOf).collect(Collectors.toSet());
+            Set<String> menuIdSet = StrUtil.split(
+                    menuIdListString, ",").stream().map(String::valueOf).collect(Collectors.toSet());
             if (!sysMenuService.existAllPrimaryKeys(menuIdSet)) {
                 return CallResult.error("数据验证失败，存在不合法的菜单数据，请刷新后重试！");
             }

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

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

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

@@ -22,6 +22,7 @@ import com.ankaibei.workFlow.webadmin.upms.model.constant.SysOnlineMenuPermType;
 import com.ankaibei.workFlow.webadmin.upms.service.SysMenuService;
 import com.ankaibei.workFlow.webadmin.upms.service.SysPermCodeService;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -38,7 +39,7 @@ import java.util.stream.Collectors;
  */
 @Slf4j
 @Service("sysMenuService")
-public class SysMenuServiceImpl extends BaseService<SysMenu, Long> implements SysMenuService {
+public class SysMenuServiceImpl extends BaseService<SysMenu, String> implements SysMenuService {
 
     @Autowired
     private SysMenuMapper sysMenuMapper;
@@ -74,7 +75,7 @@ public class SysMenuServiceImpl extends BaseService<SysMenu, Long> implements Sy
         sysMenu.setMenuId(idGenerator.nextLongId() + "");
         MyModelUtil.fillCommonsForInsert(sysMenu);
         sysMenuMapper.insert(sysMenu);
-        if (permCodeIdSet != null) {
+        if (ObjectUtils.isNotEmpty(permCodeIdSet)) {
             for (String permCodeId : permCodeIdSet) {
                 SysMenuPermCode menuPermCode = new SysMenuPermCode();
                 menuPermCode.setMenuId(sysMenu.getMenuId());
@@ -121,7 +122,7 @@ public class SysMenuServiceImpl extends BaseService<SysMenu, Long> implements Sy
     public boolean update(SysMenu sysMenu, SysMenu originalSysMenu, Set<String> permCodeIdSet) {
         MyModelUtil.fillCommonsForUpdate(sysMenu, originalSysMenu);
         sysMenu.setMenuType(originalSysMenu.getMenuType());
-        UpdateWrapper<SysMenu> uw = this.createUpdateQueryForNullValue(sysMenu, Long.valueOf(sysMenu.getMenuId()));
+        UpdateWrapper<SysMenu> uw = this.createUpdateQueryForNullValue(sysMenu, sysMenu.getMenuId());
         if (sysMenuMapper.update(sysMenu, uw) != 1) {
             return false;
         }
@@ -233,8 +234,8 @@ public class SysMenuServiceImpl extends BaseService<SysMenu, Long> implements Sy
         }
         JSONObject jsonObject = null;
         if (StringUtils.isNotBlank(permCodeIdListString)) {
-            Set<Long> permCodeIdSet = Arrays.stream(
-                    permCodeIdListString.split(",")).map(Long::valueOf).collect(Collectors.toSet());
+            Set<String> permCodeIdSet = Arrays.stream(
+                    permCodeIdListString.split(",")).map(String::valueOf).collect(Collectors.toSet());
             if (!sysPermCodeService.existAllPrimaryKeys(permCodeIdSet)) {
                 return CallResult.error("数据验证失败，存在不合法的权限字，请刷新后重试！");
             }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

application-webadmin/src/main/resources/application.yml

@@ -158,39 +158,39 @@ common-log:
   # 操作日志配置，对应配置文件common-log/OperationLogProperties.java
   operation-log:
     enabled: true
-
-aj:
-  captcha:
-    # 缓存local/redis..
-    cache-type: redis
-    # 验证码类型default两种都实例化。
-    type: default
-    # 右下角水印文字(我的水印)
-    water-mark: 我的水印
-    #点选字体样式 默认Font.BOLD
-    font-style: 1
-    #点选字体字体大小
-    font-size: 25
-    # 支持项目路径,以classpath:开头,取resource目录下路径,例：classpath:images/jigsaw
-    jigsaw: classpath:images/jigsaw
-    # 支持项目路径,以classpath:开头,取resource目录下路径,例：classpath:images/pic-click
-    pic-click: classpath:images/pic-click
-    history-data-clear-enable: false
-    # 接口请求次数一分钟限制是否开启 true|false
-    req-frequency-limit-enable: false
-    # 验证失败5次，get接口锁定
-    req-get-lock-limit: 5
-    # 验证失败后，锁定时间间隔,s
-    req-get-lock-seconds: 360
-    # get接口一分钟内请求数限制
-    req-get-minute-limit: 30
-    # check接口一分钟内请求数限制
-    req-check-minute-limit: 30
-    # verify接口一分钟内请求数限制
-    req-verify-minute-limit: 60
-    # 校验滑动拼图允许误差偏移量(默认5像素)
-    slip-offset: 5
-    # aes加密坐标开启或者禁用(true|false)
-    aes-status: true
-    # 滑动干扰项(0/1/2)
-    interference-options: 2
+#
+#aj:
+#  captcha:
+#    # 缓存local/redis..
+#    cache-type: redis
+#    # 验证码类型default两种都实例化。
+#    type: default
+#    # 右下角水印文字(我的水印)
+#    water-mark: 我的水印
+#    #点选字体样式 默认Font.BOLD
+#    font-style: 1
+#    #点选字体字体大小
+#    font-size: 25
+#    # 支持项目路径,以classpath:开头,取resource目录下路径,例：classpath:images/jigsaw
+#    jigsaw: classpath:images/jigsaw
+#    # 支持项目路径,以classpath:开头,取resource目录下路径,例：classpath:images/pic-click
+#    pic-click: classpath:images/pic-click
+#    history-data-clear-enable: false
+#    # 接口请求次数一分钟限制是否开启 true|false
+#    req-frequency-limit-enable: false
+#    # 验证失败5次，get接口锁定
+#    req-get-lock-limit: 5
+#    # 验证失败后，锁定时间间隔,s
+#    req-get-lock-seconds: 360
+#    # get接口一分钟内请求数限制
+#    req-get-minute-limit: 30
+#    # check接口一分钟内请求数限制
+#    req-check-minute-limit: 30
+#    # verify接口一分钟内请求数限制
+#    req-verify-minute-limit: 60
+#    # 校验滑动拼图允许误差偏移量(默认5像素)
+#    slip-offset: 5
+#    # aes加密坐标开启或者禁用(true|false)
+#    aes-status: true
+#    # 滑动干扰项(0/1/2)
+#    interference-options: 2

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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