From 7958f1dddb8a7f4e70d232b07a7703955ecedae0 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期六, 26 八月 2023 12:45:33 +0800
Subject: [PATCH] 优化diamante
---
service-common/src/main/java/com/java110/common/smo/impl/ContractApplyUserInnerServiceSMOImpl.java | 14 ++++----------
1 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/service-common/src/main/java/com/java110/common/smo/impl/ContractApplyUserInnerServiceSMOImpl.java b/service-common/src/main/java/com/java110/common/smo/impl/ContractApplyUserInnerServiceSMOImpl.java
index 1fa2c81..1124554 100644
--- a/service-common/src/main/java/com/java110/common/smo/impl/ContractApplyUserInnerServiceSMOImpl.java
+++ b/service-common/src/main/java/com/java110/common/smo/impl/ContractApplyUserInnerServiceSMOImpl.java
@@ -4,8 +4,8 @@
import com.java110.core.base.smo.BaseServiceSMO;
import com.java110.dto.PageDto;
import com.java110.dto.contract.ContractDto;
-import com.java110.dto.workflow.WorkflowDto;
-import com.java110.entity.audit.AuditUser;
+import com.java110.dto.oaWorkflow.WorkflowDto;
+import com.java110.dto.audit.AuditUser;
import com.java110.intf.common.IContractApplyUserInnerServiceSMO;
import com.java110.intf.common.IWorkflowInnerServiceSMO;
import com.java110.intf.store.IContractInnerServiceSMO;
@@ -140,15 +140,10 @@
if (FlowUtil.isCondition(outgoingFlow.getConditionExpression(), vars)) {
isReturn = true;
}
+
if (!isReturn) {
String assignee = ((UserTask) targetFlowElement).getAssignee();
- if (!StringUtil.isEmpty(assignee) && assignee.indexOf("${") < 0) {
- taskBusinessKeyMap.put(business_key + "_hasAudit", "1");
- }
- if ("${startUserId}".equals(assignee)) {
- taskBusinessKeyMap.put(business_key + "_hasAudit", "1");
- }
- if ("${nextUserId}".equals(assignee)) {
+ if (!StringUtil.isEmpty(assignee)) {
taskBusinessKeyMap.put(business_key + "_hasAudit", "1");
}
}
@@ -156,7 +151,6 @@
//濡傛灉涓嬩竴涓负 缁撴潫鑺傜偣
if (targetFlowElement instanceof EndEvent) {
//true 鑾峰彇杈撳嚭鑺傜偣鍚嶇О
- taskBusinessKeyMap.put(business_key + "_hasAudit", "");
taskBusinessKeyMap.put(business_key + "_hasEnd", "1");
}
}
--
Gitblit v1.8.0