From 0dc0a47cf5f655cb0dbff082f7c36613c21e328b Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期一, 12 七月 2021 18:30:01 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 5 +++--
1 files changed, 3 insertions(+), 2 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 2390090..05a37d0 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
@@ -1942,7 +1942,7 @@
}
//网格员关联楼栋
- if(!eventGridMemberAddDTO.getBuildingIds().isEmpty()){
+ if(eventGridMemberAddDTO.getBuildingIds() != null && !eventGridMemberAddDTO.getBuildingIds().isEmpty()){
List<EventGridMemberBuildingRelationDO> buildingRelationList = new ArrayList<>();
eventGridMemberAddDTO.getBuildingIds().forEach(buildingId -> {
Map<String,Long> resultMap = this.userDao.getBuilding(buildingId);
@@ -2011,6 +2011,7 @@
* @return 修改结果
*/
@Override
+ @Transactional(rollbackFor = Exception.class)
public R editGridUser(EventGridMemberEditAdminDTO gridMemberDTO){
if(gridMemberDTO.getGridMemberId() == null){
@@ -2046,7 +2047,7 @@
this.userDao.delGridMemberRelation(sysUserDO.getUserId());
//新增网格员关联楼栋
- if(!gridMemberDTO.getBuildingIds().isEmpty()){
+ if(gridMemberDTO.getBuildingIds() != null && !gridMemberDTO.getBuildingIds().isEmpty()){
List<EventGridMemberBuildingRelationDO> buildingRelationList = new ArrayList<>();
gridMemberDTO.getBuildingIds().forEach(buildingId -> {
Map<String,Long> resultMap = this.userDao.getBuilding(buildingId);
--
Gitblit v1.7.1