修改导出bug

Alan

2021-02-22 1f8196dae2aeabdefce2ff82ee4cd86706b5c48b

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

@@ -1,13 +1,17 @@
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;
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.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;
import cc.mrbird.febs.server.system.mapper.DeptMapper;
import cc.mrbird.febs.server.system.service.IDeptService;
import cc.mrbird.febs.server.system.service.IUserDataPermissionService;
@@ -32,7 +36,7 @@
@RequiredArgsConstructor
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
public class DeptServiceImpl extends ServiceImpl<DeptMapper, Dept> implements IDeptService {

    private final RedisService redisService;
    private final IUserDataPermissionService userDataPermissionService;

    @Override
@@ -73,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);
        }
@@ -96,6 +101,25 @@
        this.delete(Arrays.asList(deptIds));
    }

    @Override
    public void setDeptRedis() {
        LambdaQueryWrapper<Dept> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(Dept::getDelFlag, 0);
        List<Dept> depts =  this.baseMapper.selectList(queryWrapper);
        redisService.del("depts");
        redisService.set("depts", depts);
    }

    @Override
    public List<Dept> findAllDepts(Dept dept) {
        QueryWrapper<Dept> queryWrapper = new QueryWrapper<>();
        queryWrapper.lambda().eq(Dept::getDelFlag,0);
        if (StringUtils.isNotBlank(dept.getDeptName())) {
            queryWrapper.lambda().like(Dept::getDeptName, dept.getDeptName());
        }
        return this.baseMapper.selectList(queryWrapper);
    }

    private void buildTrees(List<DeptTree> trees, List<Dept> depts) {
        depts.forEach(dept -> {
            DeptTree tree = new DeptTree();
@@ -103,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);
        });
    }