Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

增加部门排序

Browse Source
This commit is contained in:
wr
2025-04-27 15:53:01 +08:00
parent 9d6a5875f6
commit ecb10977b8
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/DeptServiceImpl.java
View File

@@ -338,7 +338,7 @@ public class DeptServiceImpl extends ServiceImpl<DeptMapper, Dept> implements ID
LambdaQueryWrapper<Dept> deptLambdaQueryWrapper = new LambdaQueryWrapper<>();
deptLambdaQueryWrapper
.eq(Dept::getName, deptParam.getName())
.eq(Dept::getState, DataStateEnum.ENABLE.getCode());
.eq(Dept::getState, DataStateEnum.ENABLE.getCode()).orderByAsc(Dept::getSort);
//更新的时候，需排除当前记录
if (isExcludeSelf) {
if (deptParam instanceof DeptParam.DeptUpdateParam) {
@@ -427,24 +427,30 @@ public class DeptServiceImpl extends ServiceImpl<DeptMapper, Dept> implements ID
@Override
public List<Dept> getDirectSonSelf(String deptId) {
LambdaQueryWrapper<Dept> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.and(wrapper -> wrapper.
eq(Dept::getPid, deptId).
or().
eq(Dept::getId, deptId)).eq(Dept::getState, DataStateEnum.ENABLE.getCode());
lambdaQueryWrapper.and(wrapper -> wrapper
.eq(Dept::getPid, deptId)
.or()
.eq(Dept::getId, deptId)).eq(Dept::getState, DataStateEnum.ENABLE.getCode())
.orderByAsc(Dept::getSort)
;
return this.list(lambdaQueryWrapper);
}
@Override
public List<Dept> getSpecialDeptList() {
LambdaQueryWrapper<Dept> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(Dept::getSpecialType, 1).eq(Dept::getState, DataStateEnum.ENABLE.getCode());
lambdaQueryWrapper
.eq(Dept::getSpecialType, 1)
.eq(Dept::getState, DataStateEnum.ENABLE.getCode())
.orderByAsc(Dept::getSort)
;
return this.list(lambdaQueryWrapper);
}
@Override
public Dept getRootDept() {
LambdaQueryWrapper<Dept> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(Dept::getState, DataStateEnum.ENABLE.getCode()).eq(Dept::getPid, '0');
lambdaQueryWrapper.eq(Dept::getState, DataStateEnum.ENABLE.getCode()).eq(Dept::getPid, '0').orderByAsc(Dept::getSort);
return this.getOne(lambdaQueryWrapper);
}
@@ -458,7 +464,8 @@ public class DeptServiceImpl extends ServiceImpl<DeptMapper, Dept> implements ID
LambdaQueryWrapper<Dept> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(Dept::getPid, deptId).
eq(Dept::getState, DataStateEnum.ENABLE.getCode());
eq(Dept::getState, DataStateEnum.ENABLE.getCode())
.orderByAsc(Dept::getSort);
result = this.baseMapper.selectList(lambdaQueryWrapper);
if (CollectionUtils.isEmpty(result)) {
LambdaQueryWrapper<Dept> deptLambdaQueryWrapper = new LambdaQueryWrapper<>();