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

linwe

2024-09-03 764d883b5ea3bdc06abbec548b6df0511e567978

 src/main/java/org/springblade/modules/system/controller/DeptController.java

@@ -121,6 +121,17 @@
   }

   /**
    * 获取部门树形结构
    */
   @GetMapping("/treeByDept")
   @ApiOperationSupport(order = 4)
   @ApiOperation(value = "树形结构", notes = "树形结构")
   public R<List<DeptVO>> treeByDept(@RequestParam(value = "deptId", required = true) Long deptId) {
      List<DeptVO> tree = deptService.tree(deptId);
      return R.data(tree);
   }

   /**
    * 懒加载获取部门树形结构
    */
   @GetMapping("/lazy-tree")
@@ -228,9 +239,23 @@
      return R.data(deptService.getDeptAndUserTree(treeNode));
   }

   /**
    * 数据处理(社区绑定）-- 处理社区(派出所下）
    */
   @GetMapping("/dataHandleCommunityByPolice")
   public R dataHandleCommunityByPolice() {
      return R.data(deptService.dataHandleCommunityByPolice());
   }




   /**
    * 查询组织机构树数据（下级包含人员信息）(懒加载)
    * @param treeNode
    * @return
    */
   @GetMapping("/getDeptAndUserTreeLazyTree")
   @ApiOperation(value = "查询组织机构树数据（下级包含人员信息）")
   public R getDeptAndUserTreeLazyTree(DeptUserTreeNode treeNode) {
      return R.data(deptService.getDeptAndUserTreeLazyTree(treeNode));
   }

}