From 503135f1f8a7cfed29cac1786a6a7c8758eed8d3 Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期五, 16 七月 2021 10:13:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into txb
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 14 ++++++++++++--
1 files changed, 12 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 e57d976..4ce0942 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);
@@ -2047,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);
@@ -2162,4 +2162,14 @@
});
return R.ok(sysUserAgreementVOS);
}
+
+ @Override
+ public R getGridIsOk(Long userId){
+ Integer count = this.userDao.getGridIsOk(userId);
+ if(count > 0){
+ return R.ok(count);
+ }else{
+ return R.fail();
+ }
+ }
}
--
Gitblit v1.7.1