From 3dd06e31d05a37dfa7a4af2b74a6f4b265081cc2 Mon Sep 17 00:00:00 2001
From: yubo <autumnal_wind@yeah.net>
Date: 星期二, 07 四月 2026 14:16:42 +0800
Subject: [PATCH] feat(hr): 新增人员基本信息管理控制器
---
febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/DeptServiceImpl.java | 19 ++++++++++++++++---
1 files changed, 16 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..ed58c79 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);
}
@@ -105,10 +108,14 @@
}
String oldAllName = dept.getAllDeptName();
String newAllName = createALlDeptName(dept);
+ Long deptId = dept.getDeptId();
+ String newDeptName = dept.getDeptName();
dept.setModifyTime(new Date());
this.baseMapper.updateById(dept);
deptMapper.changeAllDeptName(oldAllName,newAllName,oldAllName + "%");
+ deptMapper.updateEmpAllDeptName(oldAllName,newAllName,oldAllName + "%");
+ deptMapper.updateEmpDeptName(newDeptName,deptId.toString());
}
@Override
@@ -118,12 +125,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 +174,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