From cab3425bb92d01f3494eb25c1f299038dc634c65 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期三, 15 三月 2023 23:43:48 +0800
Subject: [PATCH] 优化保养转单功能
---
service-user/src/main/java/com/java110/user/cmd/user/ListStaffOrgsCmd.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/cmd/user/ListStaffOrgsCmd.java b/service-user/src/main/java/com/java110/user/cmd/user/ListStaffOrgsCmd.java
index 5d2bd2f..f351629 100644
--- a/service-user/src/main/java/com/java110/user/cmd/user/ListStaffOrgsCmd.java
+++ b/service-user/src/main/java/com/java110/user/cmd/user/ListStaffOrgsCmd.java
@@ -67,11 +67,11 @@
for (OrgStaffRelDto orgStaffRelDto : orgStaffRels) {
orgStaffRelDto.setParentOrgId(orgStaffRelDto.getOrgId());
- findParents(orgStaffRelDto, orgDtos, null);
+ findParents(orgStaffRelDto, orgDtos, null, 0);
}
}
- private void findParents(OrgStaffRelDto orgStaffRelDto, List<OrgDto> orgDtos, OrgDto curOrgDto) {
+ private void findParents(OrgStaffRelDto orgStaffRelDto, List<OrgDto> orgDtos, OrgDto curOrgDto, int orgDeep) {
for (OrgDto orgDto : orgDtos) {
if (!orgStaffRelDto.getParentOrgId().equals(orgDto.getOrgId())) { // 浠栬嚜宸辫烦杩�
continue;
@@ -79,7 +79,7 @@
orgStaffRelDto.setParentOrgId(orgDto.getParentOrgId());
curOrgDto = orgDto;
if (StringUtil.isEmpty(orgStaffRelDto.getOrgName())) {
- orgStaffRelDto.setOrgName(orgDto.getOrgName() + orgStaffRelDto.getOrgName());
+ orgStaffRelDto.setOrgName(orgDto.getOrgName());
continue;
}
orgStaffRelDto.setOrgName(orgDto.getOrgName() + " / " + orgStaffRelDto.getOrgName());
@@ -96,7 +96,11 @@
if (curOrgDto != null && "-1".equals(curOrgDto.getParentOrgId())) {
return;
}
+ orgDeep += 1;
+ if (orgDeep > 20) {
+ return;
+ }
- findParents(orgStaffRelDto, orgDtos, curOrgDto);
+ findParents(orgStaffRelDto, orgDtos, curOrgDto, orgDeep);
}
}
--
Gitblit v1.8.0