From 63c7e9d7051ed6742eb7334346a53376b0247c29 Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期四, 01 四月 2021 09:46:03 +0800
Subject: [PATCH] 删除
---
febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/DeptServiceImpl.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 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 b80e6fd..769add2 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
@@ -74,7 +74,10 @@
.ge(Dept::getCreateTime, dept.getCreateTimeFrom())
.le(Dept::getCreateTime, dept.getCreateTimeTo());
}
- queryWrapper.lambda().in(Dept::getDeptId, userDataPermissionService.findByUserId(FebsUtil.getUserId()).split(StringConstant.COMMA));
+ if (!FebsUtil.getUserId().equals("26")&&!FebsUtil.getUserId().equals("1")) {
+ 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);
}
@@ -118,12 +121,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
@@ -166,6 +170,11 @@
private String createALlDeptName(Dept dept){
Dept parent = this.getById(dept.getParentId());
- return parent.getAllDeptName() + "/" + dept.getDeptName();
+ String parentName = parent.getAllDeptName();
+ if(StringUtils.isNotBlank(parentName)) {
+ return parent.getAllDeptName() + "/" + dept.getDeptName();
+ } else {
+ return dept.getDeptName();
+ }
}
}
--
Gitblit v1.8.0