Merge remote-tracking branch 'origin/dev' into dev

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

@@ -10,8 +10,6 @@ import com.makeit.entity.platform.auth.PlatOrg;
 import com.makeit.global.annotation.Action;
 import com.makeit.service.platform.auth.PlatOrgService;
 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 io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -54,11 +52,7 @@ public class PlatOrgController {
     @ApiOperation("树形列表")
     @PostMapping("list")
     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.currentOrg(platOrgQueryDTO));
     }
 
     @Action(module = "平台端-组织", name = "新增", code = "plat:org:add")

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

@@ -89,6 +89,8 @@ public interface PlatOrgService extends IService<PlatOrg> {
 
     List<PlatOrg> subOrgList(PlatOrgQueryDTO platOrgQueryDTO);
 
+    List<PlatOrg> currentOrg(PlatOrgQueryDTO platOrgQueryDTO);
+
     /**
      * 组织表增加一条数据
      * 增加告警配置

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

@@ -596,6 +596,20 @@ public class PlatOrgServiceImpl extends ServiceImpl<PlatOrgMapper, PlatOrg>
         return orgTree;
     }
 
+    @Override
+    public List<PlatOrg> currentOrg(PlatOrgQueryDTO platOrgQueryDTO) {
+        PlatUserVO userVOCanNull = PlatUserUtil.getUserVOCanNull();
+        String orgId = userVOCanNull.getOrgId();
+        List<String> orgIds = this.getCurrentAndSubIds(orgId);
+        platOrgQueryDTO.setOrgIds(orgIds);
+        LambdaQueryWrapper<PlatOrg> queryWrapper = getLambdaQueryWrapper(platOrgQueryDTO);
+        List<PlatOrg> list = list(queryWrapper);
+        if(CollectionUtils.isEmpty(list)){
+            return new ArrayList<>();
+        }
+        return createOrgTree(list);
+    }
+
     /**
      * 返回parentId的 树
      * @param platOrgQueryDTO