From bdcb64f0293f27e2dfb3de12a60f6e8412cb962b Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 26 五月 2022 01:45:22 +0800
Subject: [PATCH] 退费修改为 从证书地址中获取
---
service-common/src/main/java/com/java110/common/bmo/workflow/impl/QueryWorkFlowFirstStaffBMOImpl.java | 9 ++++-----
1 files changed, 4 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 43f505b..6459c60 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
@@ -97,7 +97,7 @@
List<Map> workflows = workflowServiceDaoImpl.getWorkflowInfo(BeanConvertUtil.beanCovertMap(workflowDto));
if (workflows == null || workflows.size() < 1) {
- return null;
+ return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "鏈煡璇㈠埌娴佺▼");
}
WorkflowDto tmpWorkflowDto = BeanConvertUtil.covertBean(workflows.get(0), WorkflowDto.class);
@@ -130,11 +130,10 @@
Map staffInfo = workflowStepStaffs.get(0);
String staffId = staffInfo.get("staffId") + "";
OrgDto orgDto = new OrgDto();
- orgDto.setStaffId(staffId);
if (staffId.startsWith("${")) {
return ResultVo.createResponseEntity(orgDto);
}
-
+ orgDto.setStaffId(staffId);
List<OrgDto> orgDtos = orgInnerServiceSMOImpl.queryOrgs(orgDto);
if (orgDtos == null || orgDtos.size() < 1) {
return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "鏈煡璇㈠埌鍛樺伐缁勭粐淇℃伅");
@@ -255,7 +254,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"))) {
@@ -292,7 +291,7 @@
sql.append("state varchar(12) not null COMMENT '鐘舵�� 1001 鐢宠 1002 寰呭鏍� 1003 閫�鍥� 1004 濮旀墭 1005 鍔炵粨',");
sql.append("create_time timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '鍒涘缓鏃堕棿',");
sql.append("status_cd varchar(2) NOT NULL DEFAULT '0' COMMENT '鏁版嵁鐘舵�侊紝璇︾粏鍙傝�僣_status琛紝S 淇濆瓨锛�0, 鍦ㄧ敤 1澶辨晥'");
- sql.append(")");
+ sql.append(") DEFAULT CHARSET=utf8");
logger.debug("閮ㄧ讲琛ㄥ崟sql" + sql.toString());
oaWorkflowFormInnerServiceSMOImpl.createTable(sql.toString());
--
Gitblit v1.8.0