From 7096647336507abe4d07d6300a16a86d0866b20a Mon Sep 17 00:00:00 2001 From: liujun Date: Tue, 30 Jan 2024 15:21:00 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=AE=A1=E6=89=B9=E7=AC=AC=E4=BA=8C?= =?UTF-8?q?=E8=8A=82=E7=82=B9=E6=B2=A1=E6=9C=89=E5=AD=98=E5=AE=A1=E6=89=B9?= =?UTF-8?q?=E6=84=8F=E8=A7=81bug=E4=BF=AE=E5=A4=8D=202=E3=80=81=E4=BF=AE?= =?UTF-8?q?=E5=88=AB=E5=AD=97=E4=BF=AE=E6=94=B9=203=E3=80=81=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zcloud/service/xgf/impl/XgfUserServiceImpl.java | 10 ++++++---- .../mybatis/datasource/xgf/XgfFlowsMapper.xml | 8 ++++++++ 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java b/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java index 41b3d6b7..f18af2b2 100644 --- a/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java +++ b/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java @@ -99,6 +99,8 @@ public class XgfUserServiceImpl implements XgfUserService { if (regDepartmentEntity.size() > 0) { x.put("MAIN_DEPARTMENT_NAME", regDepartmentEntity.get("NAME")); } + entity = new PageData(); + entity.putAll(x); xgfUserMapper.save(x); xgfUserDetailsMapper.save(x); } else { @@ -536,7 +538,7 @@ public class XgfUserServiceImpl implements XgfUserService { condition.put("XGF_USER_ID", flows.getString("FLOWS_ID")); PageData entity = xgfUserMapper.findById(condition); flows.put("APPOINT_ONE_CORP_ID", Jurisdiction.getUSER_ID()); - flows.put("APPOINT_ONE_CORP_NAME", entity.getString("CORP_NAME")); + flows.put("APPOINT_ONE_CORP_NAME", corpEntity.getString("CORP_NAME")); flows.put("APPOINT_ONE_TIME", DateUtil.getTime()); flows.put("APPOINT_ONE_STATUS", info.getString("STATUS")); flows.put("APPOINT_ONE_OPINION", info.getString("OPINION")); @@ -588,7 +590,7 @@ public class XgfUserServiceImpl implements XgfUserService { condition.put("XGF_USER_ID", flows.getString("FLOWS_ID")); PageData entity = xgfUserMapper.findById(condition); flows.put("APPOINT_TWO_CORP_ID", Jurisdiction.getCORPINFO_ID()); - flows.put("APPOINT_TWO_CORP_NAME", entity.getString("CORP_NAME")); + flows.put("APPOINT_TWO_CORP_NAME", corpEntity.getString("CORP_NAME")); flows.put("APPOINT_TWO_TIME", DateUtil.getTime()); flows.put("APPOINT_TWO_STATUS", info.getString("STATUS")); flows.put("APPOINT_TWO_OPINION", info.getString("OPINION")); @@ -645,7 +647,7 @@ public class XgfUserServiceImpl implements XgfUserService { condition.put("XGF_USER_ID", flows.getString("FLOWS_ID")); PageData entity = xgfUserMapper.findById(condition); flows.put("APPOINT_THREE_CORP_ID", Jurisdiction.getCORPINFO_ID()); - flows.put("APPOINT_THREE_CORP_NAME", entity.getString("CORP_NAME")); + flows.put("APPOINT_THREE_CORP_NAME", corpEntity.getString("CORP_NAME")); flows.put("APPOINT_THREE_TIME", DateUtil.getTime()); flows.put("APPOINT_THREE_STATUS", info.getString("STATUS")); flows.put("APPOINT_THREE_OPINION", info.getString("OPINION")); @@ -700,7 +702,7 @@ public class XgfUserServiceImpl implements XgfUserService { condition.put("XGF_USER_ID", flows.getString("FLOWS_ID")); PageData entity = xgfUserMapper.findById(condition); flows.put("APPOINT_FOUR_CORP_ID", Jurisdiction.getCORPINFO_ID()); - flows.put("APPOINT_FOUR_CORP_NAME", entity.getString("CORP_NAME")); + flows.put("APPOINT_FOUR_CORP_NAME", corpEntity.getString("CORP_NAME")); flows.put("APPOINT_FOUR_TIME", DateUtil.getTime()); flows.put("APPOINT_FOUR_STATUS", info.getString("STATUS")); flows.put("APPOINT_FOUR_OPINION", info.getString("OPINION")); diff --git a/src/main/resources/mybatis/datasource/xgf/XgfFlowsMapper.xml b/src/main/resources/mybatis/datasource/xgf/XgfFlowsMapper.xml index 1270676c..5b7725af 100644 --- a/src/main/resources/mybatis/datasource/xgf/XgfFlowsMapper.xml +++ b/src/main/resources/mybatis/datasource/xgf/XgfFlowsMapper.xml @@ -40,6 +40,8 @@ f.APPOINT_TWO_DEPARTMENT_NAME, f.APPOINT_TWO_USER_ID, f.APPOINT_TWO_USER_NAME, + f.APPOINT_TWO_STATUS, + f.APPOINT_TWO_OPINION, f.APPOINT_TWO_TIME, f.APPOINT_THREE_CORP_ID, f.APPOINT_THREE_CORP_NAME, @@ -123,6 +125,8 @@ APPOINT_TWO_DEPARTMENT_NAME, APPOINT_TWO_USER_ID, APPOINT_TWO_USER_NAME, + APPOINT_TWO_STATUS, + APPOINT_TWO_OPINION, APPOINT_TWO_TIME, APPOINT_THREE_CORP_ID, APPOINT_THREE_CORP_NAME, @@ -206,6 +210,8 @@ #{APPOINT_TWO_DEPARTMENT_NAME}, #{APPOINT_TWO_USER_ID}, #{APPOINT_TWO_USER_NAME}, + #{APPOINT_TWO_STATUS}, + #{APPOINT_TWO_OPINION}, #{APPOINT_TWO_TIME}, #{APPOINT_THREE_CORP_ID}, #{APPOINT_THREE_CORP_NAME}, @@ -301,6 +307,8 @@ APPOINT_TWO_DEPARTMENT_NAME = #{APPOINT_TWO_DEPARTMENT_NAME}, APPOINT_TWO_USER_ID = #{APPOINT_TWO_USER_ID}, APPOINT_TWO_USER_NAME = #{APPOINT_TWO_USER_NAME}, + APPOINT_TWO_STATUS = #{APPOINT_TWO_STATUS}, + APPOINT_TWO_OPINION = #{APPOINT_TWO_OPINION}, APPOINT_TWO_TIME = #{APPOINT_TWO_TIME}, APPOINT_THREE_CORP_ID = #{APPOINT_THREE_CORP_ID}, APPOINT_THREE_CORP_NAME = #{APPOINT_THREE_CORP_NAME},