From 912b80591187c50484a10fc56d166452cbc0dd85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E6=A0=8B?= <lidong@21tb.com>
Date: Tue, 14 Feb 2023 23:31:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E4=BA=BA=E5=91=98=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../interfaces/dito/job/WorkflowUserCronJob.java    | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/weaver/interfaces/dito/job/WorkflowUserCronJob.java b/src/weaver/interfaces/dito/job/WorkflowUserCronJob.java
index 64a12b9d..b079244a 100644
--- a/src/weaver/interfaces/dito/job/WorkflowUserCronJob.java
+++ b/src/weaver/interfaces/dito/job/WorkflowUserCronJob.java
@@ -71,6 +71,7 @@ public class WorkflowUserCronJob extends BaseCronJob {
                 }
                 baseWorkflowIdSet.add(workflowId);
                 String userIds = shareManager.getWorkflowCreater(Integer.parseInt(workflowId));
+                logger.info("workflowname-shareManager-"+userIds);
                 Set<String> userIdList = new HashSet<>(Arrays.asList(userIds.split(",")));
                 baseWorkflowMap.put(workflowId, userIdList);
                 baseWorkflowName.put(workflowId, workflowname);
@@ -141,7 +142,7 @@ public class WorkflowUserCronJob extends BaseCronJob {
 
             //人员权限修改同步
             if (updateSet.size() != 0) {
-                HashSet<String> needUpdateSet = updateWorkflow(bb, updateSet, baseWorkflowMap, modeWorkflowMap, baseWorkflowName, formModeId);
+                HashSet<String> needUpdateSet = updateWorkflow(bb, updateSet, baseWorkflowMap, modeWorkflowMap, baseWorkflowName, baseWorkflowCataCode,formModeId);
                 needUpdateSet.addAll(needUpdateWorkflowSet);
                 logger.info("needUpdateSet-size:" + needUpdateSet.size());
                 //先删除流程再重新同步人员权限
@@ -258,15 +259,15 @@ public class WorkflowUserCronJob extends BaseCronJob {
 
     /**
      * 更新建模表数据
-     *
-     * @param bb
+     *  @param bb
      * @param updateSet
      * @param baseWorkflowMap
      * @param modeWorkflowMap
      * @param baseWorkflowName
+     * @param baseWorkflowCataCode
      * @param formModeId
      */
-    private HashSet<String> updateWorkflow(BaseBean bb, Set<String> updateSet, Map<String, Set<String>> baseWorkflowMap, Map<String, Set<String>> modeWorkflowMap, Map<String, String> baseWorkflowName, String formModeId) {
+    private HashSet<String> updateWorkflow(BaseBean bb, Set<String> updateSet, Map<String, Set<String>> baseWorkflowMap, Map<String, Set<String>> modeWorkflowMap, Map<String, String> baseWorkflowName, Map<String, String> baseWorkflowCataCode, String formModeId) {
         bb.writeLog("updateWorkflow-----start");
         HashSet<String> needUpdateSet = new HashSet<>();
         String staffIdField = PropBean.getUfPropValue("staffIdFieldByCus");
@@ -280,6 +281,7 @@ public class WorkflowUserCronJob extends BaseCronJob {
             String workflowName = baseWorkflowName.get(workflowId);
             Set<String> baseUsers = baseWorkflowMap.get(workflowId);
             Set<String> modeUsers = modeWorkflowMap.get(workflowId);
+            logger.info(workflowName+baseUsers+":"+modeUsers);
             //如果差集集为0，则跳过
             if (baseUsers.containsAll(modeUsers) && baseUsers.size() == modeUsers.size()) {
                 continue;
@@ -292,7 +294,7 @@ public class WorkflowUserCronJob extends BaseCronJob {
             HashSet<String> diffUsers = new HashSet<>(baseUsers);
             diffUsers.removeAll(modeUsers);
             if (diffUsers.size() != 0) {
-                String addSql = "INSERT INTO uf_workflow_auth (userselect,effective,formmodeid,modedatacreatedate,modedatacreatetime,workflowselect,workflowname,staffid) values (?,?,?,?,?,?,?,?)";
+                String addSql = "INSERT INTO uf_workflow_auth (userselect,effective,formmodeid,modedatacreatedate,modedatacreatetime,workflowselect,workflowname,staffid,catacode) values (?,?,?,?,?,?,?,?,?)";
                 for (String addUserId : diffUsers) {
                     String workCodeQuery = "SELECT " + staffIdField + " as staffId FROM cus_fielddata WHERE id=? and SCOPEID=-1";
                     rs2.executeQuery(workCodeQuery, addUserId);
@@ -309,6 +311,7 @@ public class WorkflowUserCronJob extends BaseCronJob {
                     list.add(workflowId);
                     list.add(workflowName);
                     list.add(staffId);
+                    list.add(baseWorkflowCataCode.get(workflowId));
                     addLists.add(list);
                 }
                 boolean b2 = rs.executeBatchSql(addSql, addLists);