sunsail云平台后端管理项目工程
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
luoyb
2021-03-10 f22196a273dae1cc4f67bf6e4806e0e33fae7997 
 febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/DeptServiceImpl.java


@@ -6,8 +6,10 @@


import cc.mrbird.febs.common.core.entity.Tree;


import cc.mrbird.febs.common.core.entity.constant.FebsConstant;


import cc.mrbird.febs.common.core.entity.constant.PageConstant;


import cc.mrbird.febs.common.core.entity.constant.StringConstant;


import cc.mrbird.febs.common.core.entity.system.Dept;


import cc.mrbird.febs.common.core.entity.system.DicItem;


import cc.mrbird.febs.common.core.utils.FebsUtil;


import cc.mrbird.febs.common.core.utils.SequenceUtil;


import cc.mrbird.febs.common.core.utils.SortUtil;


import cc.mrbird.febs.common.core.utils.TreeUtil;


@@ -70,6 +72,7 @@


                    .ge(Dept::getCreateTime, dept.getCreateTimeFrom())


                    .le(Dept::getCreateTime, dept.getCreateTimeTo());


        }


        queryWrapper.lambda().in(Dept::getDeptId, userDataPermissionService.findByUserId(FebsUtil.getUserId()).split(StringConstant.COMMA));


        SortUtil.handleWrapperSort(request, queryWrapper, "orderNum", FebsConstant.ORDER_ASC, true);


        return this.baseMapper.selectList(queryWrapper);


    }


@@ -129,6 +132,7 @@


            tree.setOrderNum(dept.getOrderNum());


            tree.setDeptFunction(dept.getDeptFunction());


            tree.setDeptType(dept.getDeptType());


            tree.setAllDeptName(dept.getAllDeptName());


            trees.add(tree);


        });


    }