fixbug

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

@@ -148,7 +148,7 @@ public class PlatAlarmRecordServiceImpl extends ServiceImpl<PlatAlarmRecordMappe
             orgIdList = StreamUtil.map(platOrgList, BaseEntity::getId);
             orgIdList = StreamUtil.map(platOrgList, BaseEntity::getId);
         }
         }
         if (StringUtils.isNotEmpty(param.getOrgId())) {
         if (StringUtils.isNotEmpty(param.getOrgId())) {
-            orgIdList = Lists.newArrayList(param.getOrgId().split(","));
+            orgIdList.addAll(Lists.newArrayList(param.getOrgId().split(",")));
         }
         }
         return new LambdaQueryWrapper<PlatAlarmRecord>().ge(Objects.nonNull(param.getCreateDateFrom()), BaseEntity::getCreateDate, param.getCreateDateFrom())
         return new LambdaQueryWrapper<PlatAlarmRecord>().ge(Objects.nonNull(param.getCreateDateFrom()), BaseEntity::getCreateDate, param.getCreateDateFrom())
                 .eq(StringUtils.isNotBlank(param.getId()),BaseEntity::getId,param.getId())
                 .eq(StringUtils.isNotBlank(param.getId()),BaseEntity::getId,param.getId())

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

@@ -113,8 +113,8 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder
             List<PlatOrg> platOrgList = platOrgService.list(new QueryWrapper<PlatOrg>().lambda().eq(PlatOrg::getType, dto.getType()));
             List<PlatOrg> platOrgList = platOrgService.list(new QueryWrapper<PlatOrg>().lambda().eq(PlatOrg::getType, dto.getType()));
             orgIdList = StreamUtil.map(platOrgList, BaseEntity::getId);
             orgIdList = StreamUtil.map(platOrgList, BaseEntity::getId);
         }
         }
-        if (org.apache.commons.lang3.StringUtils.isNotEmpty(dto.getOrgId())) {
-            orgIdList = Lists.newArrayList(dto.getOrgId().split(","));
+        if (StringUtils.isNotEmpty(dto.getOrgId())) {
+            orgIdList.addAll(Lists.newArrayList(dto.getOrgId().split(",")));
         }
         }
         return new QueryWrapper<PlatElder>().lambda()
         return new QueryWrapper<PlatElder>().lambda()
                 .like(StringUtils.isNotBlank(dto.getName()), PlatElder::getName, dto.getName())
                 .like(StringUtils.isNotBlank(dto.getName()), PlatElder::getName, dto.getName())

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

@@ -166,7 +166,7 @@ public class PlatBedServiceImpl extends ServiceImpl<PlatBedMapper, PlatBed> impl
             orgIdList = StreamUtil.map(platOrgList, BaseEntity::getId);
             orgIdList = StreamUtil.map(platOrgList, BaseEntity::getId);
         }
         }
         if (StringUtil.isNotEmpty(dto.getOrgId())) {
         if (StringUtil.isNotEmpty(dto.getOrgId())) {
-            orgIdList = Lists.newArrayList(dto.getOrgId().split(","));
+            orgIdList.addAll(Lists.newArrayList(dto.getOrgId().split(",")));
         }
         }
         return baseMapper.selectBySpaceIdAndStatus(new Page<>(pageReqDTO.getPage(),pageReqDTO.getLimit()),dto,orgIdList);
         return baseMapper.selectBySpaceIdAndStatus(new Page<>(pageReqDTO.getPage(),pageReqDTO.getLimit()),dto,orgIdList);
     }
     }