diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/SsoServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/SsoServiceImpl.java index c05df9f3a2..f6f9e52dc5 100644 --- a/epmet-auth/src/main/java/com/epmet/service/impl/SsoServiceImpl.java +++ b/epmet-auth/src/main/java/com/epmet/service/impl/SsoServiceImpl.java @@ -111,6 +111,7 @@ public class SsoServiceImpl implements SsoService { userInfoFormDTO.setUid(userInfo.getOpenId()); userInfoFormDTO.setName(userInfo.getName()); userInfoFormDTO.setMobile(userInfo.getMobile()); + userInfoFormDTO.setCustomerId(customerId); Result userDTOResult = epmetUserOpenFeignClient.saveUserInfo(userInfoFormDTO); if (!userDTOResult.success()){ diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/UserInfoFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/UserInfoFormDTO.java index 6c349d424e..a2f7a2772b 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/UserInfoFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/UserInfoFormDTO.java @@ -37,4 +37,9 @@ public class UserInfoFormDTO implements Serializable { private String account; private String userId; + + /** + * 客户ID + */ + private String customerId; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserEntity.java index 167f2c8bde..c8a6f1d574 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserEntity.java @@ -35,6 +35,6 @@ public class UserEntity extends BaseEpmetEntity { * 客户ID */ @TableField(fill = FieldFill.INSERT) - private String customerId; + private String customerId = ""; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java index 2914ce40b1..58a48ca9ac 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java @@ -298,11 +298,13 @@ public class UserServiceImpl extends BaseServiceImpl implem UserEntity userEntity = new UserEntity(); userEntity.setFromApp(UserConstant.APP_RESI); userEntity.setFromClient(UserConstant.APP); + userEntity.setCustomerId(formDTO.getCustomerId()); if (baseDao.insert(userEntity) < NumConstant.ONE) { log.error("小程序登陆,居民端user表新增数据失败"); throw new RenException(UserConstant.SAVE_USER); } UserWechatEntity entity = new UserWechatEntity(); + entity.setCustomerId(formDTO.getCustomerId()); entity.setMobile(formDTO.getMobile()); entity.setUserId(userEntity.getId()); entity.setNickname(formDTO.getName());