From 3fe2aea7827eafc7513159db9a337fdf567584c8 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期一, 08 五月 2023 01:21:13 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-common/src/main/java/com/java110/common/smo/impl/OaWorkflowActivitiInnerServiceSMOImpl.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/service-common/src/main/java/com/java110/common/smo/impl/OaWorkflowActivitiInnerServiceSMOImpl.java b/service-common/src/main/java/com/java110/common/smo/impl/OaWorkflowActivitiInnerServiceSMOImpl.java
index e31d3ea..0669f61 100644
--- a/service-common/src/main/java/com/java110/common/smo/impl/OaWorkflowActivitiInnerServiceSMOImpl.java
+++ b/service-common/src/main/java/com/java110/common/smo/impl/OaWorkflowActivitiInnerServiceSMOImpl.java
@@ -7,8 +7,8 @@
import com.java110.core.factory.GenerateCodeFactory;
import com.java110.dto.PageDto;
import com.java110.dto.auditMessage.AuditMessageDto;
-import com.java110.dto.oaWorkflowData.OaWorkflowDataDto;
-import com.java110.dto.oaWorkflowXml.OaWorkflowXmlDto;
+import com.java110.dto.oaWorkflow.OaWorkflowDataDto;
+import com.java110.dto.oaWorkflow.OaWorkflowXmlDto;
import com.java110.dto.user.UserDto;
import com.java110.dto.workflow.WorkflowDto;
import com.java110.entity.audit.AuditUser;
@@ -427,6 +427,7 @@
oaWorkflowDataDto.setBusinessKey(reqJson.getString("id"));
oaWorkflowDataDto.setPage(1);
oaWorkflowDataDto.setRow(1);
+ oaWorkflowDataDto.setHis("N");
List<OaWorkflowDataDto> oaWorkflowDataDtos = oaWorkflowDataInnerServiceSMOImpl.queryOaWorkflowDatas(oaWorkflowDataDto);
if (oaWorkflowDataDtos == null || oaWorkflowDataDtos.size() < 1) {
--
Gitblit v1.8.0