zcloud_gbs
/
zcloud_gbs_basic_info_gwj
12
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

部门接口调整

main
zhaokai 2025-11-04 14:43:02 +08:00
parent dd8c53c1b2
commit 9aa5b0bc0c
2 changed files with 5 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
web-app/src/main/java/com/zcloud/basic/info/command/convertor/DepartmentCoConvertor.java
View File

@ -5,6 +5,7 @@ import com.zcloud.basic.info.dto.clientobject.DepartmentTreeInfoCO;
import com.zcloud.basic.info.persistence.dataobject.DepartmentDO; import com.zcloud.basic.info.persistence.dataobject.DepartmentDO;
import com.zcloud.gbscommon.zclouddepartment.response.ZcloudDepartmentInfoCo; import com.zcloud.gbscommon.zclouddepartment.response.ZcloudDepartmentInfoCo;
import org.mapstruct.Mapper; import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
import java.util.List; import java.util.List;

26
web-app/src/main/java/com/zcloud/basic/info/command/query/DepartmentQueryExe.java
View File

@ -15,6 +15,7 @@ import com.zcloud.basic.info.dto.clientobject.DepartmentTreeInfoCO;
import com.zcloud.basic.info.persistence.dataobject.DepartmentDO; import com.zcloud.basic.info.persistence.dataobject.DepartmentDO;
import com.zcloud.basic.info.persistence.repository.DepartmentRepository; import com.zcloud.basic.info.persistence.repository.DepartmentRepository;
import com.zcloud.gbscommon.utils.PageQueryHelper; import com.zcloud.gbscommon.utils.PageQueryHelper;
import com.zcloud.gbscommon.utils.Tools;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
@ -50,37 +51,18 @@ public class DepartmentQueryExe {
} }
public List<DepartmentTreeInfoCO> listTree(DepartmentTreeQry departmentQry) { public List<DepartmentTreeInfoCO> listTree(DepartmentTreeQry departmentQry) {
if(Objects.isNull(departmentQry.getEqCorpinfoId())){ if (Objects.isNull(departmentQry.getEqCorpinfoId())) {
departmentQry.setEqCorpinfoId(AuthContext.getTenantId()); departmentQry.setEqCorpinfoId(AuthContext.getTenantId());
} }
Map<String, Object> parmas = PageQueryHelper.toHashMap(departmentQry); Map<String, Object> parmas = PageQueryHelper.toHashMap(departmentQry);
List<DepartmentDO> pageResponse = departmentRepository.listTree(parmas); List<DepartmentDO> pageResponse = departmentRepository.listTree(parmas);
if(CollUtil.isEmpty(pageResponse)) { if (CollUtil.isEmpty(pageResponse)) {
return Collections.emptyList(); return Collections.emptyList();
} }
List<DepartmentTreeInfoCO> examCenterCOS = departmentCoConvertor.converDOsToInfoCOs(pageResponse); List<DepartmentTreeInfoCO> examCenterCOS = departmentCoConvertor.converDOsToInfoCOs(pageResponse);
Map<Long, List<DepartmentTreeInfoCO>> childrenMap = new HashMap<>(); return Tools.buildEntityTree(examCenterCOS, "id", "parentId", "childrenList");
for (DepartmentTreeInfoCO dept : examCenterCOS) {
childrenMap
.computeIfAbsent(dept.getParentId(), k -> new ArrayList<>())
.add(dept);
}
return buildTree(childrenMap, 0L);
} }
private List<DepartmentTreeInfoCO> buildTree(Map<Long, List<DepartmentTreeInfoCO>> childrenMap, Long parentId) {
List<DepartmentTreeInfoCO> nodes = childrenMap.get(parentId);
if (nodes == null) {
return Collections.emptyList();
}
for (DepartmentTreeInfoCO node : nodes) {
// 递归构建子节点
List<DepartmentTreeInfoCO> children = buildTree(childrenMap, node.getId());
node.setChildrenList(children);
}
return nodes;
}
public DepartmentCO info(Long id) { public DepartmentCO info(Long id) {
DepartmentDO info = departmentRepository.getById(id); DepartmentDO info = departmentRepository.getById(id);