customerId修改

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<UserDTO> userDTOResult = epmetUserOpenFeignClient.saveUserInfo(userInfoFormDTO);
         if (!userDTOResult.success()){

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

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 = "";
 
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java

@@ -298,11 +298,13 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> 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());