|
|
@@ -62,10 +62,11 @@ public class PtlAgreementDeptServiceImpl extends ServiceImpl<PtlAgreementDeptMap
|
|
|
}
|
|
|
|
|
|
LambdaQueryWrapper<SysDept> allWrapper = new LambdaQueryWrapper<>();
|
|
|
- allWrapper.like(SysDept :: getRoute, deptId)
|
|
|
- .eq(SysDept :: getIsDelete, 0);
|
|
|
if (Objects.nonNull(nameDept)){
|
|
|
- allWrapper.like(Objects.isNull(nameDept), SysDept :: getRoute, nameDept.getId());
|
|
|
+ allWrapper.like(Objects.nonNull(nameDept), SysDept :: getRoute, nameDept.getId()).eq(SysDept :: getIsDelete, 0);
|
|
|
+ }else{
|
|
|
+ allWrapper.like(SysDept :: getRoute, deptId)
|
|
|
+ .eq(SysDept :: getIsDelete, 0);
|
|
|
}
|
|
|
List<SysDept> depts = deptMapper.selectList(allWrapper);
|
|
|
List<SysDeptVo> voDept = new ArrayList<>();
|