feat:组织机构搜索bug

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

@@ -403,18 +403,24 @@ public class PlatOrgServiceImpl extends ServiceImpl<PlatOrgMapper, PlatOrg>
         String isTenant = userVOCanNull.getIsTenant();
         String isTenant = userVOCanNull.getIsTenant();
         //如果是租户账号 则有所有权限 返回最顶级
         //如果是租户账号 则有所有权限 返回最顶级
         if (StringUtils.equals(isTenant, CommonEnum.YES.getValue())) {
         if (StringUtils.equals(isTenant, CommonEnum.YES.getValue())) {
+            boolean typeFlag = StringUtils.isNotEmpty(param.getType());
+            boolean nameFlag = StringUtils.isNotEmpty(param.getName());
+            boolean statusFlag = StringUtils.isNotEmpty(param.getStatus());
             List<PlatOrg> orgList = this.list(new LambdaQueryWrapper<PlatOrg>()
             List<PlatOrg> orgList = this.list(new LambdaQueryWrapper<PlatOrg>()
-                    .eq(StringUtils.isNotEmpty(param.getType()), PlatOrg::getType, param.getType())
-                    .like(StringUtils.isNotEmpty(param.getName()), PlatOrg::getName, param.getName())
-                    .eq(StringUtils.isNotEmpty(param.getStatus()), PlatOrg::getStatus, param.getStatus())
+                    .eq(typeFlag, PlatOrg::getType, param.getType())
+                    .like(nameFlag, PlatOrg::getName, param.getName())
+                    .eq(statusFlag, PlatOrg::getStatus, param.getStatus())
                     .eq(PlatOrg::getStatus, CommonEnum.YES.getValue())
                     .eq(PlatOrg::getStatus, CommonEnum.YES.getValue())
             );
             );
-            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;
+            if (typeFlag || nameFlag || statusFlag) {
+                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 getOrgTree(orgList, Collections.singletonList(TenantIdUtil.getTenantId()));
         }
         }
 
 
         //平台账号 查询权限范围 生成不一定连续的树结构
         //平台账号 查询权限范围 生成不一定连续的树结构