Merge remote-tracking branch 'origin/master'

luoyb

2021-02-17 e3ee3dac0ef868d7c58295c89003cc35deab16d1

 febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/DeptServiceImpl.java

@@ -1,5 +1,6 @@
package cc.mrbird.febs.server.system.service.impl;

import cc.mrbird.febs.common.core.constant.ModuleCode;
import cc.mrbird.febs.common.core.entity.DeptTree;
import cc.mrbird.febs.common.core.entity.QueryRequest;
import cc.mrbird.febs.common.core.entity.Tree;
@@ -7,6 +8,7 @@
import cc.mrbird.febs.common.core.entity.constant.PageConstant;
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.SequenceUtil;
import cc.mrbird.febs.common.core.utils.SortUtil;
import cc.mrbird.febs.common.core.utils.TreeUtil;
import cc.mrbird.febs.common.redis.service.RedisService;
@@ -75,6 +77,7 @@
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void createDept(Dept dept) {
        dept.setDeptId(SequenceUtil.generateId(0L, ModuleCode.FRAM_SYSTEM));
        if (dept.getParentId() == null) {
            dept.setParentId(Dept.TOP_DEPT_ID);
        }
@@ -124,6 +127,8 @@
            tree.setParentId(dept.getParentId().toString());
            tree.setLabel(dept.getDeptName());
            tree.setOrderNum(dept.getOrderNum());
            tree.setDeptFunction(dept.getDeptFunction());
            tree.setDeptType(dept.getDeptType());
            trees.add(tree);
        });
    }