修改出库审批添加

src/main/java/com/dreamchaser/depository_manage/service/impl/QyWxOperationService.java

@@ -1762,7 +1762,10 @@ public class QyWxOperationService {
             approval_template_approver_list.add(approval_template_approver_Label);
 
 
-        } else {
+
+
+        }
+        else {
             // 如果不是中心仓下的仓库
             if (Integer.compare(2, flagForOpenDepository) == 0) {
                 // 如果该仓库是通过开放仓库获取到的
@@ -1795,13 +1798,12 @@ public class QyWxOperationService {
 
 
         if(!flag){
-            // 获取当前管理员的企业微信userId
-            List<String> qywxUserIdList = new ArrayList<>();
             for (Long mtId:materialTypeIdList
                  ) {
                 // 获取当前仓库的管理员列表
                 List<Integer> userIdByDid = roleMapper.findUserIdByMtId(mtId);
-
+                // 获取当前管理员的企业微信userId
+                List<String> qywxUserIdList = new ArrayList<>();
                 for (Integer userId : userIdByDid
                 ) {
                     // 获取对应管理员信息
@@ -1812,25 +1814,24 @@ public class QyWxOperationService {
                     }
                     qywxUserIdList.add(user);
                 }
-
-            }
                 if (qywxUserIdList.size() > 0) {
                     // 用于设置仓库管理员流程
                     Approval_template_approver approval_template_approver_depository_manager = new Approval_template_approver();
-                approval_template_approver_depository_manager.setAttr(2);
+                    approval_template_approver_depository_manager.setAttr(1);
                     approval_template_approver_depository_manager.setUserid(qywxUserIdList);
 
                     approval_template_approver_list.add(approval_template_approver_depository_manager);
                 }
-        } else {
-            // 获取当前管理员的企业微信userId
-            List<String> qywxUserIdList = new ArrayList<>();
+            }
+        }
+        else{
             for (Integer depositoryId : depositoryIdList
 
             ) {
                 // 获取当前仓库的管理员列表
                 List<Integer> userIdByDid = roleMapper.findUserIdByDid(depositoryId);
-
+                // 获取当前管理员的企业微信userId
+                List<String> qywxUserIdList = new ArrayList<>();
                 for (Integer userId : userIdByDid
                 ) {
                     // 获取对应管理员信息
@@ -1841,20 +1842,20 @@ public class QyWxOperationService {
                     }
                     qywxUserIdList.add(user);
                 }
-
-
-            }
                 if (qywxUserIdList.size() > 0) {
                     // 用于设置仓库管理员流程
                     Approval_template_approver approval_template_approver_depository_manager = new Approval_template_approver();
-                approval_template_approver_depository_manager.setAttr(2);
+                    approval_template_approver_depository_manager.setAttr(1);
                     approval_template_approver_depository_manager.setUserid(qywxUserIdList);
 
                     approval_template_approver_list.add(approval_template_approver_depository_manager);
                 }
+
+            }
         }
 
 
+
         // 设置审批流程
         approvalTemplate.setApprover(approval_template_approver_list);
 
@@ -2238,6 +2239,7 @@ public class QyWxOperationService {
         approvalTemplate.setNotify_type(2);
 
 
+
         String[] depositoryManagerS = mainRecord.getDepositoryManager().split(",");
         List<String> depositoryManagerWorkWechats = new ArrayList<>();
         for (String depositorymanager:depositoryManagerS
@@ -2261,6 +2263,9 @@ public class QyWxOperationService {
         approval_template_approver_list.add(approval_template_approver_Label);
 
 
+
+
+
         if(!flag){
             for (Long mtId:materialTypeIdList
             ) {
@@ -2287,7 +2292,8 @@ public class QyWxOperationService {
                     approval_template_approver_list.add(approval_template_approver_depository_manager);
                 }
             }
-        } else {
+        }
+        else{
             for (Integer depositoryId : depositoryIdList
 
             ) {
@@ -2333,6 +2339,7 @@ public class QyWxOperationService {
     }
 
 
+
     /**
      * 用于发送入库审批
      *