优化组织机构树接口

zlmy-modules/zlmy-boot/src/main/java/com/testor/module/sys/controller/NewSysUserController.java

@@ -480,9 +480,9 @@ public class NewSysUserController extends SuperController {
         return baseResponse;
     }
 
-    @ApiOperation(value = "【根据当前机构id获取子组织机构树及子部门、人员信息】 ", notes = "personnelInfo 为空时或0时，获取人员信息")
+    @ApiOperation(value = "【根据当前机构id获取子组织机构树及子部门、人员信息】 ", notes = "personnelInfo 为空时或0时，获取人员信息；isSubordinates 是否包含下属 0否 1是")
     @GetMapping(value = "/getOrgAndTree")
-    public BaseResponse<NewTreeVo> getOrgAndTree(String orgId, String personnelInfo) {
+    public BaseResponse<NewTreeVo> getOrgAndTree(String orgId, String personnelInfo,@RequestParam(value = "isSubordinates",defaultValue = "0") String isSubordinates) {
         BaseResponse<NewTreeVo> baseResponse = new BaseResponse<>();
         // 获取所有非删除状态的SysOrg记录
         List<NewSysOrg> allOrgs = sysOrgService.list(new QueryWrapper<NewSysOrg>()
@@ -491,7 +491,7 @@ public class NewSysUserController extends SuperController {
         Map<String, NewSysOrg> orgMap = allOrgs.stream()
                 .collect(Collectors.toMap(NewSysOrg::getOrgId, Function.identity()));
         // 构建树结构
-        NewTreeVo rootNewTreeVo = buildTree(orgId, orgMap, personnelInfo,0,"1");
+        NewTreeVo rootNewTreeVo = buildTree(orgId, orgMap, personnelInfo,0,isSubordinates);
         baseResponse.setData(rootNewTreeVo);
         return baseResponse;
     }