fix: 修复bug

server-service/src/main/java/com/makeit/dto/platform/elder/children/PlatElderChildrenInfoDTOVO.java

@@ -28,8 +28,6 @@ public class PlatElderChildrenInfoDTOVO extends BaseTenantDTO {
     @ApiModelProperty(value = "长者id")
     @ApiModelProperty(value = "长者id")
     private String elderName;
     private String elderName;
 
 
-    @NotBlank(message = "姓名不能为空")
-    @Size(max = 50, message = "姓名最长为50个字符")
     @ApiModelProperty(value = "姓名")
     @ApiModelProperty(value = "姓名")
     private String name;
     private String name;
 
 

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

@@ -172,9 +172,9 @@ public class PlatAlarmRecordServiceImpl extends ServiceImpl<PlatAlarmRecordMappe
         }
         }
         if (CollectionUtils.isNotEmpty(choiceOrgIdList) && CollectionUtils.isNotEmpty(typeOrgIdList)) {
         if (CollectionUtils.isNotEmpty(choiceOrgIdList) && CollectionUtils.isNotEmpty(typeOrgIdList)) {
             orgIdList = new ArrayList<>(CollectionUtils.intersection(typeOrgIdList, choiceOrgIdList));
             orgIdList = new ArrayList<>(CollectionUtils.intersection(typeOrgIdList, choiceOrgIdList));
-            if (CollectionUtils.isEmpty(orgIdList)) {
-                orgIdList.add("-1");
-            }
+        }
+        if (CollectionUtils.isEmpty(orgIdList)) {
+            orgIdList.add("-1");
         }
         }
 
 
         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())

server-service/src/main/java/com/makeit/service/platform/auth/impl/PlatOrgServiceImpl.java

@@ -413,11 +413,6 @@ public class PlatOrgServiceImpl extends ServiceImpl<PlatOrgMapper, PlatOrg>
                     .eq(PlatOrg::getStatus, CommonEnum.YES.getValue())
                     .eq(PlatOrg::getStatus, CommonEnum.YES.getValue())
             );
             );
             if (typeFlag || nameFlag) {
             if (typeFlag || nameFlag) {
-                Map<String, List<PlatOrg>> parentIdMap = orgList.stream().collect(Collectors.groupingBy(PlatOrg::getParentId));
-                orgList.forEach(vo -> {
-                    List<PlatOrg> childList = parentIdMap.get(vo.getId());
-                    vo.setChildren(childList);
-                });
                 return orgList;
                 return orgList;
             }
             }
             return getOrgTree(orgList, Collections.singletonList(TenantIdUtil.getTenantId()));
             return getOrgTree(orgList, Collections.singletonList(TenantIdUtil.getTenantId()));

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

@@ -137,9 +137,9 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder
         }
         }
         if (CollectionUtils.isNotEmpty(choiceOrgIdList) && CollectionUtils.isNotEmpty(typeOrgIdList)) {
         if (CollectionUtils.isNotEmpty(choiceOrgIdList) && CollectionUtils.isNotEmpty(typeOrgIdList)) {
             orgIdList = new ArrayList<>(CollectionUtils.intersection(typeOrgIdList, choiceOrgIdList));
             orgIdList = new ArrayList<>(CollectionUtils.intersection(typeOrgIdList, choiceOrgIdList));
-            if (CollectionUtils.isEmpty(orgIdList)) {
-                orgIdList.add("-1");
-            }
+        }
+        if (CollectionUtils.isEmpty(orgIdList)) {
+            orgIdList.add("-1");
         }
         }
 
 
         return new QueryWrapper<PlatElder>().lambda()
         return new QueryWrapper<PlatElder>().lambda()

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

@@ -179,9 +179,9 @@ public class PlatBedServiceImpl extends ServiceImpl<PlatBedMapper, PlatBed> impl
         }
         }
         if (CollectionUtils.isNotEmpty(choiceOrgIdList) && CollectionUtils.isNotEmpty(typeOrgIdList)) {
         if (CollectionUtils.isNotEmpty(choiceOrgIdList) && CollectionUtils.isNotEmpty(typeOrgIdList)) {
             orgIdList = new ArrayList<>(CollectionUtils.intersection(typeOrgIdList, choiceOrgIdList));
             orgIdList = new ArrayList<>(CollectionUtils.intersection(typeOrgIdList, choiceOrgIdList));
-            if (CollectionUtils.isEmpty(orgIdList)) {
-                orgIdList.add("-1");
-            }
+        }
+        if (CollectionUtils.isEmpty(orgIdList)) {
+            orgIdList.add("-1");
         }
         }
         return baseMapper.selectBySpaceIdAndStatus(new Page<>(pageReqDTO.getPage(),pageReqDTO.getLimit()),dto,orgIdList);
         return baseMapper.selectBySpaceIdAndStatus(new Page<>(pageReqDTO.getPage(),pageReqDTO.getLimit()),dto,orgIdList);
     }
     }