fixbug

server-service/src/main/java/com/makeit/service/platform/alarm/impl/PlatAlarmRecordServiceImpl.java

@@ -151,7 +151,16 @@ public class PlatAlarmRecordServiceImpl extends ServiceImpl<PlatAlarmRecordMappe
         if (StringUtils.isNotEmpty(param.getOrgId())) {
             choiceOrgIdList.addAll(Lists.newArrayList(param.getOrgId().split(",")));
         }
-        List<String> orgIdList = new ArrayList<>(CollectionUtils.intersection(typeOrgIdList, choiceOrgIdList));
+        List<String> orgIdList = Lists.newArrayList();
+        if (CollectionUtils.isNotEmpty(choiceOrgIdList)) {
+            orgIdList = choiceOrgIdList;
+        }
+        if (CollectionUtils.isNotEmpty(typeOrgIdList)) {
+            orgIdList = typeOrgIdList;
+        }
+        if (CollectionUtils.isNotEmpty(choiceOrgIdList) && CollectionUtils.isNotEmpty(typeOrgIdList)) {
+            orgIdList = new ArrayList<>(CollectionUtils.intersection(typeOrgIdList, choiceOrgIdList));
+        }
 
         return new LambdaQueryWrapper<PlatAlarmRecord>().ge(Objects.nonNull(param.getCreateDateFrom()), BaseEntity::getCreateDate, param.getCreateDateFrom())
                 .eq(StringUtils.isNotBlank(param.getId()),BaseEntity::getId,param.getId())

server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderServiceImpl.java

@@ -117,7 +117,16 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder
         if (StringUtils.isNotEmpty(dto.getOrgId())) {
             choiceOrgIdList.addAll(Lists.newArrayList(dto.getOrgId().split(",")));
         }
-        List<String> orgIdList = new ArrayList<>(CollectionUtils.intersection(typeOrgIdList, choiceOrgIdList));
+        List<String> orgIdList = Lists.newArrayList();
+        if (CollectionUtils.isNotEmpty(choiceOrgIdList)) {
+            orgIdList = choiceOrgIdList;
+        }
+        if (CollectionUtils.isNotEmpty(typeOrgIdList)) {
+            orgIdList = typeOrgIdList;
+        }
+        if (CollectionUtils.isNotEmpty(choiceOrgIdList) && CollectionUtils.isNotEmpty(typeOrgIdList)) {
+            orgIdList = new ArrayList<>(CollectionUtils.intersection(typeOrgIdList, choiceOrgIdList));
+        }
 
         return new QueryWrapper<PlatElder>().lambda()
                 .like(StringUtils.isNotBlank(dto.getName()), PlatElder::getName, dto.getName())

server-service/src/main/java/com/makeit/service/platform/space/impl/PlatBedServiceImpl.java

@@ -170,7 +170,16 @@ public class PlatBedServiceImpl extends ServiceImpl<PlatBedMapper, PlatBed> impl
         if (StringUtil.isNotEmpty(dto.getOrgId())) {
             choiceOrgIdList.addAll(Lists.newArrayList(dto.getOrgId().split(",")));
         }
-        List<String> orgIdList = new ArrayList<>(CollectionUtils.intersection(typeOrgIdList, choiceOrgIdList));
+        List<String> orgIdList = Lists.newArrayList();
+        if (CollectionUtils.isNotEmpty(choiceOrgIdList)) {
+            orgIdList = choiceOrgIdList;
+        }
+        if (CollectionUtils.isNotEmpty(typeOrgIdList)) {
+            orgIdList = typeOrgIdList;
+        }
+        if (CollectionUtils.isNotEmpty(choiceOrgIdList) && CollectionUtils.isNotEmpty(typeOrgIdList)) {
+            orgIdList = new ArrayList<>(CollectionUtils.intersection(typeOrgIdList, choiceOrgIdList));
+        }
         return baseMapper.selectBySpaceIdAndStatus(new Page<>(pageReqDTO.getPage(),pageReqDTO.getLimit()),dto,orgIdList);
     }