xieb
2023-05-06 34a56a1a9cd315f11fa51d872805979e9e3101dd
用户管理新增部门权限控制
5 files modified
28 ■■■■■ changed files
skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/controller/DeptController.java 8 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/mapper/DeptMapper.java 2 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/mapper/DeptMapper.xml 12 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/service/IDeptService.java 1 ●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/service/impl/DeptServiceImpl.java 5 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/controller/DeptController.java
@@ -123,6 +123,14 @@
        return R.data(tree);
    }
    @GetMapping("/treeByParentId")
    @ApiOperationSupport(order = 10)
    @ApiOperation(value = "树形结构", notes = "树形结构")
    public R<List<DeptVO>> treeByParentId(String parentId) {
        List<DeptVO> tree = deptService.treeByParentId(parentId);
        return R.data(tree);
    }
    /**
     * 懒加载获取部门树形结构
     */
skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/mapper/DeptMapper.java
@@ -52,6 +52,8 @@
     */
    List<DeptVO> tree(String tenantId);
    List<DeptVO> treeByParentId(String parentId);
    /**
     * 懒加载获取树形节点
     *
skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/mapper/DeptMapper.xml
@@ -76,6 +76,18 @@
        ORDER BY sort
    </select>
    <select id="treeByParentId" resultMap="treeNodeResultMap">
        select id, parent_id, dept_name as title, id as "value", id as "key" from blade_dept where is_deleted = 0
        <if test="_parameter!=null and _parameter!=''">
            and (
                id = #{_parameter} or parent_id = #{_parameter} or parent_id in (
                    select b.id from blade_dept b where b.is_deleted = 0 and b.PARENT_ID = #{_parameter}
                )
            )
        </if>
        ORDER BY sort
    </select>
    <select id="lazyTree" resultMap="treeNodeResultMap" >
        SELECT
            dept.id,
skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/service/IDeptService.java
@@ -49,6 +49,7 @@
     * @return
     */
    List<DeptVO> tree(String tenantId);
    List<DeptVO> treeByParentId(String parentId);
    /**
     * 懒加载树形结构
skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/service/impl/DeptServiceImpl.java
@@ -87,6 +87,11 @@
    }
    @Override
    public List<DeptVO> treeByParentId(String parentId) {
        return ForestNodeMerger.merge(baseMapper.treeByParentId(parentId));
    }
    @Override
    public List<DeptVO> lazyTree(String tenantId, Long parentId) {
        if (AuthUtil.isAdministrator()) {
            tenantId = StringPool.EMPTY;