fix: 平台端机构管理过滤当前用户所属机构及下级

saas-module/src/main/java/com/makeit/controller/plat/PlatOrgController.java

@@ -10,6 +10,8 @@ import com.makeit.entity.platform.auth.PlatOrg;
 import com.makeit.global.annotation.Action;
 import com.makeit.global.annotation.Action;
 import com.makeit.service.platform.auth.PlatOrgService;
 import com.makeit.service.platform.auth.PlatOrgService;
 import com.makeit.service.platform.auth.PlatUserService;
 import com.makeit.service.platform.auth.PlatUserService;
+import com.makeit.utils.user.plat.PlatUserUtil;
+import com.makeit.utils.user.plat.PlatUserVO;
 import com.makeit.vo.platform.auth.PlatOrgQueryDTO;
 import com.makeit.vo.platform.auth.PlatOrgQueryDTO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
@@ -52,6 +54,10 @@ public class PlatOrgController {
     @ApiOperation("树形列表")
     @ApiOperation("树形列表")
     @PostMapping("list")
     @PostMapping("list")
     public ApiResponseEntity<List<PlatOrg>> list(@RequestBody PlatOrgQueryDTO platOrgQueryDTO){
     public ApiResponseEntity<List<PlatOrg>> list(@RequestBody PlatOrgQueryDTO platOrgQueryDTO){
+        PlatUserVO userVOCanNull = PlatUserUtil.getUserVOCanNull();
+        String orgId = userVOCanNull.getOrgId();
+        List<String> orgIds = platOrgService.getCurrentAndSubIds(orgId);
+        platOrgQueryDTO.setOrgIds(orgIds);
         return ApiResponseUtils.success(platOrgService.subOrgList(platOrgQueryDTO));
         return ApiResponseUtils.success(platOrgService.subOrgList(platOrgQueryDTO));
     }
     }
 
 

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

@@ -116,4 +116,6 @@ public interface PlatOrgService extends IService<PlatOrg> {
      * @return
      * @return
      */
      */
     List<PlatOrg> belongToScopeListIgnoreTenant(PlatOrg param);
     List<PlatOrg> belongToScopeListIgnoreTenant(PlatOrg param);
+
+    List<String> getCurrentAndSubIds(String id);
 }
 }

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.google.common.collect.Lists;
 import com.makeit.common.entity.BaseEntity;
 import com.makeit.common.entity.BaseEntity;
 import com.makeit.common.page.PageReqDTO;
 import com.makeit.common.page.PageReqDTO;
 import com.makeit.common.page.PageVO;
 import com.makeit.common.page.PageVO;
@@ -571,6 +572,7 @@ public class PlatOrgServiceImpl extends ServiceImpl<PlatOrgMapper, PlatOrg>
                 .like(StringUtils.isNotBlank(dto.getName()),PlatOrg::getName,dto.getName())
                 .like(StringUtils.isNotBlank(dto.getName()),PlatOrg::getName,dto.getName())
                 .eq(StringUtils.isNotBlank(dto.getType()),PlatOrg::getType,dto.getType())
                 .eq(StringUtils.isNotBlank(dto.getType()),PlatOrg::getType,dto.getType())
                 .eq(StringUtils.isNotBlank(dto.getStatus()),PlatOrg::getStatus,dto.getStatus())
                 .eq(StringUtils.isNotBlank(dto.getStatus()),PlatOrg::getStatus,dto.getStatus())
+                .in(CollectionUtils.isNotEmpty(dto.getOrgIds()), PlatOrg::getId, dto.getOrgIds())
                 .orderByDesc(BaseEntity::getUpdateDate);
                 .orderByDesc(BaseEntity::getUpdateDate);
         return queryWrapper;
         return queryWrapper;
     }
     }
@@ -721,4 +723,14 @@ public class PlatOrgServiceImpl extends ServiceImpl<PlatOrgMapper, PlatOrg>
         }
         }
         return orgList;
         return orgList;
     }
     }
+
+    @Override
+    public List<String> getCurrentAndSubIds(String id) {
+        List<String> ids = Lists.newArrayList(id);
+        LambdaQueryWrapper<PlatOrg> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.like(PlatOrg::getPath, id);
+        List<String> subIds = this.list(queryWrapper).stream().map(PlatOrg::getId).collect(Collectors.toList());
+        ids.addAll(subIds);
+        return ids;
+    }
 }
 }

server-service/src/main/java/com/makeit/vo/platform/auth/PlatOrgQueryDTO.java

@@ -5,6 +5,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
 
 
+import java.util.List;
+
 @ApiModel("租户端部门 查询")
 @ApiModel("租户端部门 查询")
 @Data
 @Data
 public class PlatOrgQueryDTO extends BaseOrgDTO {
 public class PlatOrgQueryDTO extends BaseOrgDTO {
@@ -18,4 +20,7 @@ public class PlatOrgQueryDTO extends BaseOrgDTO {
     @ApiModelProperty(value = "字典类型 1-居家 2-机构")
     @ApiModelProperty(value = "字典类型 1-居家 2-机构")
     private String type;
     private String type;
 
 
+    @ApiModelProperty(value = "机构id", hidden = true)
+    private List<String> orgIds;
+
 }
 }