From 8e5b5ecebcd244c78c081d608b6af90ba1a2644c Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期三, 28 七月 2021 16:47:37 +0800
Subject: [PATCH] 修改bug

---
 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
index 5cb937a..51f89dc 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -1954,7 +1954,7 @@
                     compareCodeMemberDO.setLocalGridMemberId(sysUserDO.getUserId().toString());
                     compareCodeMemberDO.setLocalGridMemberId(sysUserDO.getNickName());
                     compareCodeMemberDO.setLcGridMemberId(eventGridMemberAddDTO.getLcMemberId());
-                    compareCodeMemberDO.setLcBindUserId(eventGridMemberAddDTO.getLcBingUserId());
+                    compareCodeMemberDO.setLcBindUserId(eventGridMemberAddDTO.getLcBindUserId());
                     compareCodeMemberDO.setLcGridMemberName(eventGridMemberAddDTO.getLcMemberName());
                     compareCodeMemberDO.setCreateAt(new Date());
                     lcCompareMemberCodeMapper.insert(compareCodeMemberDO);
@@ -2008,7 +2008,12 @@
         if(!gridMemberPage.getRecords().isEmpty()){
             gridMemberPage.getRecords().forEach(gridMember -> {
                 //查询网格员关联市平台网格员id
-                gridMember.setLcMemberId(this.userDao.getLcMemberId(gridMember.getUserId()));
+                Map<String,String> lcMemberMap = this.userDao.getLcMemberId(gridMember.getUserId());
+                if(lcMemberMap != null){
+                    gridMember.setLcGridMemberId(lcMemberMap.get("lc_grid_member_id"));
+                    gridMember.setLcGridMemberName(lcMemberMap.get("lc_grid_member_name"));
+                    gridMember.setLcBindUserId(lcMemberMap.get("lc_bind_user_id"));
+                }
 
                 //查询网格员关联楼栋信息
                 List<GridMemberBuildingVO> memberBuildingList = eventGridMemberBuildingRelationMapper.getGridMemberBuildingRelation(gridMember.getUserId());
@@ -2074,7 +2079,7 @@
                     compareCodeMemberDO.setLocalGridMemberId(sysUserDO.getUserId().toString());
                     compareCodeMemberDO.setLocalGridMemberId(sysUserDO.getNickName());
                     compareCodeMemberDO.setLcGridMemberId(gridMemberDTO.getLcMemberId());
-                    compareCodeMemberDO.setLcBindUserId(gridMemberDTO.getLcBingUserId());
+                    compareCodeMemberDO.setLcBindUserId(gridMemberDTO.getLcBindUserId());
                     compareCodeMemberDO.setLcGridMemberName(gridMemberDTO.getLcMemberName());
                     compareCodeMemberDO.setCreateAt(new Date());
                     lcCompareMemberCodeMapper.insert(compareCodeMemberDO);

--
Gitblit v1.7.1