From b200b681bc401bb11c133a79273ba78cb6ebedf8 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 30 七月 2021 18:16:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 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..2b686cc 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
@@ -1945,16 +1945,16 @@
.eq(LcCompareCodeMemberDO::getLcGridMemberId,eventGridMemberAddDTO.getLcMemberId()));
if(compareCodeMemberDO != null){
compareCodeMemberDO.setLocalGridMemberId(sysUserDO.getUserId().toString());
- compareCodeMemberDO.setLocalGridMemberId(sysUserDO.getNickName());
+ compareCodeMemberDO.setGridMemberName(sysUserDO.getNickName());
compareCodeMemberDO.setUpdateAt(new Date());
lcCompareMemberCodeMapper.updateById(compareCodeMemberDO);
}else{
compareCodeMemberDO = new LcCompareCodeMemberDO();
compareCodeMemberDO.setId(Snowflake.getId());
compareCodeMemberDO.setLocalGridMemberId(sysUserDO.getUserId().toString());
- compareCodeMemberDO.setLocalGridMemberId(sysUserDO.getNickName());
+ compareCodeMemberDO.setGridMemberName(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.setLcMemberId(lcMemberMap.get("lc_grid_member_id"));
+ gridMember.setLcMemberName(lcMemberMap.get("lc_grid_member_name"));
+ gridMember.setLcBindUserId(lcMemberMap.get("lc_bind_user_id"));
+ }
//查询网格员关联楼栋信息
List<GridMemberBuildingVO> memberBuildingList = eventGridMemberBuildingRelationMapper.getGridMemberBuildingRelation(gridMember.getUserId());
@@ -2065,16 +2070,16 @@
.eq(LcCompareCodeMemberDO::getLcGridMemberId,gridMemberDTO.getLcMemberId()));
if(compareCodeMemberDO != null){
compareCodeMemberDO.setLocalGridMemberId(sysUserDO.getUserId().toString());
- compareCodeMemberDO.setLocalGridMemberId(sysUserDO.getNickName());
+ compareCodeMemberDO.setGridMemberName(sysUserDO.getNickName());
compareCodeMemberDO.setUpdateAt(new Date());
lcCompareMemberCodeMapper.updateById(compareCodeMemberDO);
}else{
compareCodeMemberDO = new LcCompareCodeMemberDO();
compareCodeMemberDO.setId(Snowflake.getId());
compareCodeMemberDO.setLocalGridMemberId(sysUserDO.getUserId().toString());
- compareCodeMemberDO.setLocalGridMemberId(sysUserDO.getNickName());
+ compareCodeMemberDO.setGridMemberName(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