rakor
/
wms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor(department): 调整部门更新与创建逻辑 

- 注释掉禁止修改AD域同步部门的校验逻辑
- 移除创建部门时自动生成sourceId的逻辑
- 更新部门时仅当source为0时允许修改名称、父id和sourceId
- 优化部门更新代码结构，提高代码清晰度
This commit is contained in:
曹鹏飞 2026-05-25 14:12:57 +08:00
parent 9a54619974
commit 226198c102
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/DepartmentControllerService.java
View File

@ -51,7 +51,7 @@ public class DepartmentControllerService {
public void update(DepartmentUpdateQO request) { public void update(DepartmentUpdateQO request) {
Department department = deptService.getById(request.getId()); Department department = deptService.getById(request.getId());
VUtil.trueThrowBusinessError(Objects.isNull(department)).throwMessage("部门不存在"); VUtil.trueThrowBusinessError(Objects.isNull(department)).throwMessage("部门不存在");
VUtil.trueThrowBusinessError(Objects.equals(department.getSource(), 1)).throwMessage("不能修改从AD域同步的部门信息"); // VUtil.trueThrowBusinessError(Objects.equals(department.getSource(), 1)).throwMessage("不能修改从AD域同步的部门信息");
VUtil.trueThrowBusinessError(deptService.lambdaQuery() VUtil.trueThrowBusinessError(deptService.lambdaQuery()
.eq(Department::getParentId, request.getParentId()) .eq(Department::getParentId, request.getParentId())
.eq(Department::getName, request.getName()) .eq(Department::getName, request.getName())

19
nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/DepartmentServiceImpl.java
View File

@ -28,9 +28,8 @@ import java.util.stream.Collectors;
/** /**
* <p> * <p>
* 服务实现类 * 服务实现类
* </p> * </p>
*
* @author 代码生成器生成 * @author 代码生成器生成
* @since 2025 * @since 2025
*/ */
@ -46,7 +45,6 @@ public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Departm
Department department = new Department() Department department = new Department()
.setName(request.getName()) .setName(request.getName())
.setSource(0) .setSource(0)
.setSourceId(Optional.ofNullable(request.getNo()).orElse(RandomUtil.randomString(10)))
.setParentId(request.getParentId()) .setParentId(request.getParentId())
.setEnable(request.getEnable()) .setEnable(request.getEnable())
.setCreateBy(UserUtil.getUserName()) .setCreateBy(UserUtil.getUserName())
@ -68,17 +66,16 @@ public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Departm
Department dept1 = getById(request.getId()); Department dept1 = getById(request.getId());
VUtil.trueThrowBusinessError(Objects.isNull(dept1)).throwMessage("部门不存在"); VUtil.trueThrowBusinessError(Objects.isNull(dept1)).throwMessage("部门不存在");
Department dept2 = new Department() Department dept2 = new Department()
.setName(request.getName()) .setId(dept1.getId())
.setParentId(request.getParentId())
.setUpdateBy(UserUtil.getUserName()) .setUpdateBy(UserUtil.getUserName())
.setUpdateTime(LocalDateTime.now()) .setUpdateTime(LocalDateTime.now())
.setId(dept1.getId()) .setEnable(request.getEnable());
.setSource(dept1.getSource())
.setEnable(request.getEnable())
.setCreateBy(dept1.getCreateBy())
.setCreateTime(dept1.getCreateTime())
.setSourceId(request.getNo());
if (dept1.getSource() == 0) {
dept2.setName(request.getName());
dept2.setSourceId(dept1.getSourceId());
dept2.setParentId(request.getParentId());
}
//Department dept2 = BeanUtil.copy(dept1, Department.class); //Department dept2 = BeanUtil.copy(dept1, Department.class);
// dept2.setName(request.getName()) // dept2.setName(request.getName())