From 0444972925d67eb9e32c9b2d36f2eda24d2f58c2 Mon Sep 17 00:00:00 2001
From: yz_08 <yz_0812@outlook.com>
Date: 星期三, 17 三月 2021 04:03:54 +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 | 27 +++++++++++++++++++++++++--
1 files changed, 25 insertions(+), 2 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 222e037..46d22c2 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
@@ -9,6 +9,7 @@
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;
@@ -40,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) {
@@ -80,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
@@ -94,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
@@ -105,12 +118,13 @@
}
@Override
- public void setDeptRedis() {
+ public List<Dept> 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);
+ return depts;
}
@Override
@@ -151,4 +165,13 @@
}
}
+ private String createALlDeptName(Dept dept){
+ Dept parent = this.getById(dept.getParentId());
+ String parentName = parent.getAllDeptName();
+ if(StringUtils.isNotBlank(parentName)) {
+ return parent.getAllDeptName() + "/" + dept.getDeptName();
+ } else {
+ return dept.getDeptName();
+ }
+ }
}
--
Gitblit v1.8.0