From fda3f979616e3c5e26993ec7033900cd188ea296 Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期四, 11 三月 2021 09:38:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/DeptServiceImpl.java | 23 ++++++++++++++++++++++-
1 files changed, 22 insertions(+), 1 deletions(-)
diff --git a/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/DeptServiceImpl.java b/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/DeptServiceImpl.java
index a90b52a..b80e6fd 100644
--- a/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/DeptServiceImpl.java
+++ b/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/DeptServiceImpl.java
@@ -6,8 +6,11 @@
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.entity.system.UserDataPermission;
+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;
@@ -38,6 +41,7 @@
public class DeptServiceImpl extends ServiceImpl<DeptMapper, Dept> implements IDeptService {
private final RedisService redisService;
private final IUserDataPermissionService userDataPermissionService;
+ private final DeptMapper deptMapper;
@Override
public Map<String, Object> findDepts(QueryRequest request, Dept dept) {
@@ -70,6 +74,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);
}
@@ -77,12 +82,19 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void createDept(Dept dept) {
- dept.setDeptId(SequenceUtil.generateId(0L, ModuleCode.FRAM_SYSTEM));
+ long deptId = SequenceUtil.generateId(0L, ModuleCode.FRAM_SYSTEM);
+ dept.setDeptId(deptId);
if (dept.getParentId() == null) {
dept.setParentId(Dept.TOP_DEPT_ID);
}
+ dept.setAllDeptName(createALlDeptName(dept));
dept.setCreateTime(new Date());
this.save(dept);
+
+ UserDataPermission userDataPermission = new UserDataPermission();
+ userDataPermission.setDeptId(deptId);
+ userDataPermission.setUserId(Long.parseLong(FebsUtil.getUserId()));
+ userDataPermissionService.save(userDataPermission);
}
@Override
@@ -91,8 +103,12 @@
if (dept.getParentId() == null) {
dept.setParentId(Dept.TOP_DEPT_ID);
}
+ String oldAllName = dept.getAllDeptName();
+ String newAllName = createALlDeptName(dept);
dept.setModifyTime(new Date());
this.baseMapper.updateById(dept);
+
+ deptMapper.changeAllDeptName(oldAllName,newAllName,oldAllName + "%");
}
@Override
@@ -129,6 +145,7 @@
tree.setOrderNum(dept.getOrderNum());
tree.setDeptFunction(dept.getDeptFunction());
tree.setDeptType(dept.getDeptType());
+ tree.setAllDeptName(dept.getAllDeptName());
trees.add(tree);
});
}
@@ -147,4 +164,8 @@
}
}
+ private String createALlDeptName(Dept dept){
+ Dept parent = this.getById(dept.getParentId());
+ return parent.getAllDeptName() + "/" + dept.getDeptName();
+ }
}
--
Gitblit v1.8.0