From 093b73aadb022895a02dbbcd64b87613e19b547b Mon Sep 17 00:00:00 2001
From: 1098226878@qq.com <1098226878@qq.com>
Date: 星期一, 10 一月 2022 18:05:21 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-common/src/main/java/com/java110/common/smo/impl/AllocationStorehouseUserInnerServiceSMOImpl.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/service-common/src/main/java/com/java110/common/smo/impl/AllocationStorehouseUserInnerServiceSMOImpl.java b/service-common/src/main/java/com/java110/common/smo/impl/AllocationStorehouseUserInnerServiceSMOImpl.java
index 4e6ed20..196408c 100644
--- a/service-common/src/main/java/com/java110/common/smo/impl/AllocationStorehouseUserInnerServiceSMOImpl.java
+++ b/service-common/src/main/java/com/java110/common/smo/impl/AllocationStorehouseUserInnerServiceSMOImpl.java
@@ -247,12 +247,15 @@
workflowDto.setStoreId(storeId);
List<WorkflowDto> workflowDtos = workflowInnerServiceSMOImpl.queryWorkflows(workflowDto);
if (workflowDtos != null && workflowDtos.size() == 0) {
- throw new IllegalArgumentException("鏈壘鍒� 璋冩嫧娴佺▼鎴栨壘鍒板鏉★紝璇峰湪鐗╀笟璐﹀彿绯荤粺绠＄悊涓嬫祦绋嬬鐞嗕腑閰嶇疆娴佺▼!");
+ throw new IllegalArgumentException("鏈壘鍒� 璋冩嫧娴佺▼锛岃鍦ㄧ墿涓氳处鍙风郴缁熺鐞嗕笅娴佺▼绠＄悊涓厤缃祦绋�!");
}
List<String> flowIdList = new ArrayList<String>();
for (WorkflowDto workflowDto1 : workflowDtos) {
- if (StringUtil.isEmpty(workflowDto1.getProcessDefinitionKey())) {
- throw new IllegalArgumentException("璋冩嫧娴佺▼娴佺▼杩樻湭閮ㄧ讲");
+ if (StringUtil.isEmpty(workflowDto1.getProcessDefinitionKey()) && WorkflowDto.FLOW_TYPE_ALLOCATION_STOREHOUSE.equals(workflowDto1.getFlowType())) {
+ throw new IllegalArgumentException("灏忓尯缂栫爜="+workflowDto1.getCommunityId()+"鐨勭墿鍝佽皟鎷ㄦ祦绋嬭繕鏈儴缃�");
+ }
+ if (StringUtil.isEmpty(workflowDto1.getProcessDefinitionKey()) && WorkflowDto.FLOW_TYPE_ALLOCATION_STOREHOUSE_GO.equals(workflowDto1.getFlowType())) {
+ throw new IllegalArgumentException("灏忓尯缂栫爜="+workflowDto1.getCommunityId()+"鐨勭墿鍝佽璋冩嫧杩樻湭閮ㄧ讲");
}
flowIdList.add(WorkflowDto.DEFAULT_PROCESS + workflowDto1.getFlowId());
}
--
Gitblit v1.8.0