From 873197abd3ae5e447f57683031cea6896f0cf2aa Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 25 十月 2022 13:01:15 +0800
Subject: [PATCH] 加入营销商品功能
---
service-common/src/main/java/com/java110/common/bmo/workflow/impl/QueryWorkFlowFirstStaffBMOImpl.java | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/service-common/src/main/java/com/java110/common/bmo/workflow/impl/QueryWorkFlowFirstStaffBMOImpl.java b/service-common/src/main/java/com/java110/common/bmo/workflow/impl/QueryWorkFlowFirstStaffBMOImpl.java
index 6b6c584..20555fa 100755
--- a/service-common/src/main/java/com/java110/common/bmo/workflow/impl/QueryWorkFlowFirstStaffBMOImpl.java
+++ b/service-common/src/main/java/com/java110/common/bmo/workflow/impl/QueryWorkFlowFirstStaffBMOImpl.java
@@ -15,11 +15,13 @@
import com.java110.dto.oaWorkflowForm.OaWorkflowFormDto;
import com.java110.dto.oaWorkflowXml.OaWorkflowXmlDto;
import com.java110.dto.org.OrgDto;
+import com.java110.dto.org.OrgStaffRelDto;
import com.java110.dto.workflow.WorkflowDto;
import com.java110.dto.workflow.WorkflowModelDto;
import com.java110.intf.oa.IOaWorkflowFormInnerServiceSMO;
import com.java110.intf.oa.IOaWorkflowInnerServiceSMO;
import com.java110.intf.oa.IOaWorkflowXmlInnerServiceSMO;
+import com.java110.intf.store.IOrgStaffRelV1InnerServiceSMO;
import com.java110.intf.user.IOrgInnerServiceSMO;
import com.java110.po.oaWorkflow.OaWorkflowPo;
import com.java110.po.oaWorkflowXml.OaWorkflowXmlPo;
@@ -79,6 +81,9 @@
private IOaWorkflowFormInnerServiceSMO oaWorkflowFormInnerServiceSMOImpl;
@Autowired
+ private IOrgStaffRelV1InnerServiceSMO orgStaffRelV1InnerServiceSMOImpl;
+
+ @Autowired
private RepositoryService repositoryService;
@Autowired
@@ -129,16 +134,19 @@
Map staffInfo = workflowStepStaffs.get(0);
String staffId = staffInfo.get("staffId") + "";
- OrgDto orgDto = new OrgDto();
+ OrgStaffRelDto orgDto = new OrgStaffRelDto();
if (staffId.startsWith("${")) {
return ResultVo.createResponseEntity(orgDto);
}
orgDto.setStaffId(staffId);
- List<OrgDto> orgDtos = orgInnerServiceSMOImpl.queryOrgs(orgDto);
- if (orgDtos == null || orgDtos.size() < 1) {
+
+ OrgStaffRelDto orgStaffRelDto = new OrgStaffRelDto();
+ orgStaffRelDto.setStaffId(staffId);
+ List<OrgStaffRelDto> orgStaffRelDtos = orgStaffRelV1InnerServiceSMOImpl.queryStaffOrgNames(orgStaffRelDto);
+ if (orgStaffRelDtos == null || orgStaffRelDtos.size() < 1) {
return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "鏈煡璇㈠埌鍛樺伐缁勭粐淇℃伅");
}
- orgDto = orgDtos.get(0);
+ orgDto = orgStaffRelDtos.get(0);
orgDto.setStaffName(staffInfo.get("staffName") + "");
return ResultVo.createResponseEntity(orgDto);
@@ -254,7 +262,7 @@
sql.append(" varchar");
isVarchar = true;
} else if ("textarea".equals(component.getString("type"))) {
- sql.append(" longtext");
+ sql.append(" longtext CHARACTER SET utf8");
} else if ("textdate".equals(component.getString("type"))) {
sql.append(" date");
} else if ("textdatetime".equals(component.getString("type"))) {
--
Gitblit v1.8.0