fix: 修复bug

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

@@ -164,18 +164,27 @@ public class PlatAlarmRecordServiceImpl extends ServiceImpl<PlatAlarmRecordMappe
             choiceOrgIdList.addAll(Lists.newArrayList(param.getOrgId().split(",")));
         }
         List<String> orgIdList = Lists.newArrayList();
-        if (CollectionUtils.isNotEmpty(choiceOrgIdList)) {
+        if (com.makeit.utils.old.StringUtils.isNotEmpty(param.getType()) && com.makeit.utils.old.StringUtils.isEmpty(param.getOrgId())) {
             orgIdList = choiceOrgIdList;
+            if (CollectionUtils.isEmpty(orgIdList)) {
+                orgIdList.add("-1");
             }
-        if (CollectionUtils.isNotEmpty(typeOrgIdList)) {
-            orgIdList = typeOrgIdList;
         }
+
+        if (com.makeit.utils.old.StringUtils.isNotEmpty(param.getOrgId()) && com.makeit.utils.old.StringUtils.isEmpty(param.getType())) {
+            orgIdList = choiceOrgIdList;
+            if (CollectionUtils.isEmpty(orgIdList)) {
+                orgIdList.add("-1");
+            }
+        }
+        if (com.makeit.utils.old.StringUtils.isNotEmpty(param.getOrgId()) && com.makeit.utils.old.StringUtils.isNotEmpty(param.getType())) {
             if (CollectionUtils.isNotEmpty(choiceOrgIdList) && CollectionUtils.isNotEmpty(typeOrgIdList)) {
                 orgIdList = new ArrayList<>(CollectionUtils.intersection(typeOrgIdList, choiceOrgIdList));
-        }
                 if (CollectionUtils.isEmpty(orgIdList)) {
                     orgIdList.add("-1");
                 }
+            }
+        }
 
         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

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

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

@@ -171,18 +171,28 @@ public class PlatBedServiceImpl extends ServiceImpl<PlatBedMapper, PlatBed> impl
             choiceOrgIdList.addAll(Lists.newArrayList(dto.getOrgId().split(",")));
         }
         List<String> orgIdList = Lists.newArrayList();
-        if (CollectionUtils.isNotEmpty(choiceOrgIdList)) {
+        if (com.makeit.utils.old.StringUtils.isNotEmpty(dto.getType()) && com.makeit.utils.old.StringUtils.isEmpty(dto.getOrgId())) {
             orgIdList = choiceOrgIdList;
+            if (CollectionUtils.isEmpty(orgIdList)) {
+                orgIdList.add("-1");
+            }
+        }
+
+        if (com.makeit.utils.old.StringUtils.isNotEmpty(dto.getOrgId()) && com.makeit.utils.old.StringUtils.isEmpty(dto.getType())) {
+            orgIdList = choiceOrgIdList;
+            if (CollectionUtils.isEmpty(orgIdList)) {
+                orgIdList.add("-1");
             }
-        if (CollectionUtils.isNotEmpty(typeOrgIdList)) {
-            orgIdList = typeOrgIdList;
         }
+        if (com.makeit.utils.old.StringUtils.isNotEmpty(dto.getOrgId()) && com.makeit.utils.old.StringUtils.isNotEmpty(dto.getType())) {
             if (CollectionUtils.isNotEmpty(choiceOrgIdList) && CollectionUtils.isNotEmpty(typeOrgIdList)) {
                 orgIdList = new ArrayList<>(CollectionUtils.intersection(typeOrgIdList, choiceOrgIdList));
-        }
                 if (CollectionUtils.isEmpty(orgIdList)) {
                     orgIdList.add("-1");
                 }
+            }
+        }
+
         return baseMapper.selectBySpaceIdAndStatus(new Page<>(pageReqDTO.getPage(),pageReqDTO.getLimit()),dto,orgIdList);
     }