From 1ac012b0397e09a1fa1a61ae5fe9f875d438ce75 Mon Sep 17 00:00:00 2001
From: Bill <771989711@qq.com>
Date: Tue, 10 Oct 2023 08:47:49 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E3=80=91=E5=AE=8C=E5=96=84=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E4=B8=8D=E6=A0=A1=E9=AA=8C=E7=BD=91=E6=A0=BCID?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/UserResiInfoServiceImpl.java     |  3 ++-
 .../com/epmet/service/impl/UserServiceImpl.java   | 15 +++++++++------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/code/smart-community/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java b/code/smart-community/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java
index 99ffac21..9138496b 100644
--- a/code/smart-community/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java
+++ b/code/smart-community/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java
@@ -278,7 +278,8 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl<UserResiInfoDao, Us
         userRoleDTO.setApp(userResiInfoDTO.getApp());
         userRoleDTO.setRoleKey(EpmetRoleKeyConstant.REGISTERED_RESI);
         //居民角色对应的网格Id存默认值-all
-		userRoleDTO.setGridId(UserRoleConstant.DEFAULT_GRID_ID);
+//		userRoleDTO.setGridId(UserRoleConstant.DEFAULT_GRID_ID);
+		userRoleDTO.setGridId(userResiInfoDTO.getGridId());
         userRoleService.saveUserRole(userRoleDTO);
         //4:保存baseInfo
 		UserBaseInfoEntity baseInfo = ConvertUtils.sourceToTarget(userResiInfoDTO, UserBaseInfoEntity.class);
diff --git a/code/smart-community/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java b/code/smart-community/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java
index 72887bcb..b52fc2f4 100644
--- a/code/smart-community/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java
+++ b/code/smart-community/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java
@@ -227,7 +227,8 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
             // 已录入身份证号：true;未完善：false.
             result.setCompleteIdNum(StringUtils.isNotBlank(myselfMsg.getIdNum()));
             result.setRegisterGridName(ModuleConstant.EMPTY_STR);
-            if (StringUtils.isNotBlank(myselfMsg.getGridId())) {
+            // TODO: 2023/10/9 暂时注释不校验网格ID
+            /*if (StringUtils.isNotBlank(myselfMsg.getGridId())) {
                 //registerGridName 当前在哪个网格，显示哪个网格的名称
                 CustomerGridFormDTO gridId = new CustomerGridFormDTO();
                 gridId.setGridId(myResiUserInfoFormDTO.getGridId());
@@ -239,7 +240,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
                         log.warn(gridResult.getMsg());
                     }
                 }
-            }
+            }*/
 
             //拥有角色名称列表
             UserRoleFormDTO userRoleFormDTO = new UserRoleFormDTO();
@@ -310,13 +311,15 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
             wechatDTO.setUserId(userDTO.getId());
             wechatDTO.setUpdatedBy(userDTO.getId());
             wechatDTO.setUpdatedTime(new Date());
-            if (userWechatDao.updateByUserId(wechatDTO) < NumConstant.ONE) {
-                log.error("小程序登陆，居民端user_wechat表更新数据失败");
-                throw new RenException(UserConstant.UPDATE_USER_WECHAT);
-            }
+//            if (userWechatDao.updateByUserId(wechatDTO) < NumConstant.ONE) {
+//                log.error("小程序登陆，居民端user_wechat表更新数据失败");
+//                throw new RenException(UserConstant.UPDATE_USER_WECHAT);
+//            }
             resultDTO.setId(userDTO.getId());
         }
 
+        resultDTO.setCustomerId(wechatDTO.getCustomerId());
+
         return resultDTO;
     }