新增组织查询调整 ids

This commit is contained in:
chenbowen
2025-10-29 08:51:35 +08:00
parent 10e2637838
commit 744567d999
4 changed files with 73 additions and 8 deletions

View File

@@ -257,12 +257,20 @@ public class DeptServiceImplTest extends BaseDbUnitTest {
DeptDO dept = randomPojo(DeptDO.class, o -> { // 等会查询到
o.setName("开发部");
o.setStatus(CommonStatusEnum.ENABLE.getStatus());
o.setParentId(DeptDO.PARENT_ID_ROOT);
o.setSort(1);
}).setDeptSource(1);
deptMapper.insert(dept);
// 测试 name 不匹配
deptMapper.insert(ObjectUtils.cloneIgnoreId(dept, o -> o.setName("")));
deptMapper.insert(ObjectUtils.cloneIgnoreId(dept, o -> {
o.setName("");
o.setSort(2);
}));
// 测试 status 不匹配
deptMapper.insert(ObjectUtils.cloneIgnoreId(dept, o -> o.setStatus(CommonStatusEnum.DISABLE.getStatus())));
deptMapper.insert(ObjectUtils.cloneIgnoreId(dept, o -> {
o.setStatus(CommonStatusEnum.DISABLE.getStatus());
o.setSort(3);
}));
// 准备参数
DeptListReqVO reqVO = new DeptListReqVO();
reqVO.setName("");
@@ -275,6 +283,41 @@ public class DeptServiceImplTest extends BaseDbUnitTest {
assertPojoEquals(dept, sysDeptDOS.get(0));
}
@Test
public void testGetDeptList_reqVO_ids() {
DeptDO dept1 = randomPojo(DeptDO.class, o -> {
o.setName("集团一部");
o.setStatus(CommonStatusEnum.ENABLE.getStatus());
o.setParentId(DeptDO.PARENT_ID_ROOT);
o.setSort(1);
}).setDeptSource(1);
deptMapper.insert(dept1);
DeptDO dept2 = randomPojo(DeptDO.class, o -> {
o.setName("集团二部");
o.setStatus(CommonStatusEnum.ENABLE.getStatus());
o.setParentId(DeptDO.PARENT_ID_ROOT);
o.setSort(2);
}).setDeptSource(1);
deptMapper.insert(dept2);
DeptDO otherDept = randomPojo(DeptDO.class, o -> {
o.setName("其他部门");
o.setStatus(CommonStatusEnum.ENABLE.getStatus());
o.setParentId(DeptDO.PARENT_ID_ROOT);
o.setSort(3);
}).setDeptSource(1);
deptMapper.insert(otherDept);
DeptListReqVO reqVO = new DeptListReqVO();
reqVO.setIds(Arrays.asList(String.valueOf(dept1.getId()), String.valueOf(dept2.getId())));
List<DeptDO> result = deptService.getDeptList(reqVO);
assertEquals(2, result.size());
assertEquals(dept1.getId(), result.get(0).getId());
assertEquals(dept2.getId(), result.get(1).getId());
assertTrue(result.stream().noneMatch(item -> item.getId().equals(otherDept.getId())));
}
@Test
public void testGetChildDeptList() {
// mock 数据1 级别子节点)