diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowService.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowService.java index 33474bbfeb..c99b7e83c8 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowService.java +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowService.java @@ -463,7 +463,7 @@ public class FlowService extends MybatisBaseService { nextUserSid = stringResultBean.getData(); } } - } else if("公司间调账".equals(service) && ("Activity_01xvwhd".equals(bv.getTaskDefKey()) || "Activity_040lvti".equals(bv.getTaskDefKey()))){ + } else if ("公司间调账".equals(service) && ("Activity_01xvwhd".equals(bv.getTaskDefKey()) || "Activity_040lvti".equals(bv.getTaskDefKey()))) { if (StringUtils.isBlank(nextUserSid)) { bv.setOrgSidPath(ydfOrgPath); ResultBean stringResultBean = getNextNodeUserSidsOfSubmit(bv); @@ -475,7 +475,7 @@ public class FlowService extends MybatisBaseService { nextUserSid = stringResultBean.getData(); } } - }else if (StringUtils.isBlank(nextUserSid)) { + } else if (StringUtils.isBlank(nextUserSid)) { ResultBean stringResultBean = getNextNodeUserSidsOfSubmit(bv); if (!stringResultBean.getSuccess()) { //下一环节用户为空的情况 @@ -599,7 +599,9 @@ public class FlowService extends MybatisBaseService { } } } - + if ("Activity_0y8ofyd".equals(bv.getTaskDefKey()) || "Activity_09chr0i".equals(bv.getTaskDefKey())) { + contains = false; + } if (contains) { bv.setUserSid(nextUserSid); bv.setTaskId(vo.getTaskId()); 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 0aa164777e..81871b4784 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 @@ -391,9 +391,6 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService sysUserVos = sysUserFeign.getOtherOrgRoleUser(userRoleQuery).getData(); StringBuilder nextNodeUserSids = new StringBuilder();