From c6b376d676cc8893b2e87daea9bbdcbf6d844de2 Mon Sep 17 00:00:00 2001
From: ligaode <ligaode>
Date: Fri, 16 May 2025 17:48:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WmsInventoryAllocateBillService.java      | 28 ++++++++++---------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBillService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBillService.java
index 81871b4784..fbf79bf70c 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBillService.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBillService.java
@@ -378,19 +378,21 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService<WmsInven
         //获取下一环节审批角色
         List<String> candidateGroups = voList.get(0).getCandidateGroups();
         UserRoleQuery userRoleQuery = new UserRoleQuery();
-        userRoleQuery.setRoleSid(candidateGroups.get(0));
-        if (bv.getTaskDefKey().equals("Activity_0eb1lqn")) {//调出方配件主管审批
-            userRoleQuery.setOrgSid(wmsInventoryAllocateBill.getInPlatSid());
-            bv.setOrgSidPath(drOrg.getOrgSidPath());
-        } else if (bv.getTaskDefKey().equals("Activity_0y8ofyd")) {//调入方配件主管审批
-            userRoleQuery.setOrgSid(wmsInventoryAllocateBill.getOutPlatSid());
-            bv.setOrgSidPath(dcOrg.getOrgSidPath());
-        } else if (bv.getTaskDefKey().equals("Activity_09chr0i")) {//调入方配件主管审批
-            userRoleQuery.setOrgSid(wmsInventoryAllocateBill.getOutPlatSid());
-            bv.setOrgSidPath(dcOrg.getOrgSidPath());
-        } else if (bv.getTaskDefKey().equals("Activity_1jchfap")) {//调出方站长审批
-            userRoleQuery.setOrgSid(wmsInventoryAllocateBill.getInPlatSid());
-            bv.setOrgSidPath(drOrg.getOrgSidPath());
+        if (candidateGroups != null && candidateGroups.size() > 0){
+            userRoleQuery.setRoleSid(candidateGroups.get(0));
+            if (bv.getTaskDefKey().equals("Activity_0eb1lqn")) {//调出方配件主管审批
+                userRoleQuery.setOrgSid(wmsInventoryAllocateBill.getInPlatSid());
+                bv.setOrgSidPath(drOrg.getOrgSidPath());
+            } else if (bv.getTaskDefKey().equals("Activity_0y8ofyd")) {//调入方配件主管审批
+                userRoleQuery.setOrgSid(wmsInventoryAllocateBill.getOutPlatSid());
+                bv.setOrgSidPath(dcOrg.getOrgSidPath());
+            } else if (bv.getTaskDefKey().equals("Activity_09chr0i")) {//调入方配件主管审批
+                userRoleQuery.setOrgSid(wmsInventoryAllocateBill.getOutPlatSid());
+                bv.setOrgSidPath(dcOrg.getOrgSidPath());
+            } else if (bv.getTaskDefKey().equals("Activity_1jchfap")) {//调出方站长审批
+                userRoleQuery.setOrgSid(wmsInventoryAllocateBill.getInPlatSid());
+                bv.setOrgSidPath(drOrg.getOrgSidPath());
+            }
         }
         List<SysUserVo> sysUserVos = sysUserFeign.getOtherOrgRoleUser(userRoleQuery).getData();
         StringBuilder nextNodeUserSids = new StringBuilder();