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},