修改系统审批功能

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

@@ -2466,7 +2466,8 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
                 // 将当前redis中存储的spno删除
                 redisTemplate.delete(spNo);
             }
-        } else {
+        }
+        else {
             // 如果是部门负责人
 
             String departmentheadTime = recordP.getDepartmentheadTime();
@@ -2480,18 +2481,9 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
                 if ("2".equals(spStatus)) {
                     // 如果点击的是通过
                     map.put("departmentheadPass", 1);
-                    map.put("state", "待仓储中心负责人审核");
-                    // 获取仓储中心负责人标签的用户userId
-                    List<String> qyWxLabelUserList = QyWxConfig.getQyWxLabelUserList(userAgent);
                     StringBuilder depositoryManager = new StringBuilder();
-                    for (String s : qyWxLabelUserList) {
-                        Map<String, Object> userByQyWxUserId = PortConfig.findUserByQyWxUserId(s);
-                        UserByPort user = (UserByPort) userByQyWxUserId.get("user");
-                        depositoryManager.append(user.getId()).append(",");
-                    }
                     if (flagForOpenDepository == 2) {
                         map.put("state", "待部门负责人审核");
-                        depositoryManager = new StringBuilder();
                         // 获取当前选中的仓库
                         Depository depositoryById = depositoryMapper.findDepositoryById(recordP.getDepositoryId());
                         // 获取当前仓库所属的部门
@@ -2509,6 +2501,15 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
                             UserByPort user = (UserByPort) userByQyWxUserId.get("user");
                             depositoryManager.append(user.getId()).append(",");
                         }
+                    }else{
+                        map.put("state", "待仓储中心负责人审核");
+                        // 获取仓储中心负责人标签的用户userId
+                        List<String> qyWxLabelUserList = QyWxConfig.getQyWxLabelUserList(userAgent);
+                        for (String s : qyWxLabelUserList) {
+                            Map<String, Object> userByQyWxUserId = PortConfig.findUserByQyWxUserId(s);
+                            UserByPort user = (UserByPort) userByQyWxUserId.get("user");
+                            depositoryManager.append(user.getId()).append(",");
+                        }
                     }
 
                     map.put("depositoryManager", depositoryManager.toString());

src/test/java/com/dreamchaser/depository_manage/OtherTest.java

@@ -35,7 +35,8 @@ public class OtherTest {
         ApprovalInfo_Details_Approver approver = new ApprovalInfo_Details_Approver();
         approver.setUserId("PangFuZhen");
         finalApprovalInfo_details.setApprover(approver);
-//        depositoryRecordService.reviewByQyWxApprovalOut("",);
+         int flagForDepository = 2;
+        depositoryRecordService.reviewByQyWxApprovalOut("1", finalApprovalInfo_details, "0a7ffa452096d330934052105a67794a", "2", "202304140032", true, flagForDepository);
     }