From 1ecf2ce81f8fbb4113e3b029332706098d5e7845 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 21 三月 2025 11:48:15 +0800
Subject: [PATCH] 格式调整
---
business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java b/business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java
index 819ae1d..0c283e6 100644
--- a/business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java
@@ -1272,13 +1272,7 @@
taskVO.getHandlerUnitId().add(dept.getDeptId());
taskVO.getHandlerUnitName().add(dept.getDeptName());
taskVO.getPromoterName().add(this.getDeptLeaderShowName(dept));
- String[] str = dept.getAncestors().split(",");
- if (str.length >= 4){
- taskVO.getPromoterUnitName().add(dept.getParentName() +"-"+dept.getDeptName());
- }else {
- taskVO.getPromoterUnitName().add(dept.getDeptName());
- }
-
+ taskVO.getPromoterUnitName().add(this.setDeptNameWithParentName(dept));
}
}
} else {
@@ -2098,7 +2092,7 @@
// 閮ㄩ棬
SysDept dept = sysDeptService.selectDeptById(Long.parseLong(split[1]));
if (Objects.nonNull(dept)) {
- vo.getPromoterUnitName().add(dept.getDeptName());
+ vo.getPromoterUnitName().add(this.setDeptNameWithParentName(dept));
vo.getPromoterName().add(this.getDeptLeaderShowName(dept));
}
}
@@ -2114,6 +2108,19 @@
}
/**
+ * 璁剧疆閮ㄩ棬鍚嶇О鏃跺甫涓婁笂绾ч儴闂ㄥ悕绉�
+ * @param dept
+ */
+ private String setDeptNameWithParentName(SysDept dept) {
+ String[] str = dept.getAncestors().split(",");
+ if (str.length >= 4){
+ return dept.getParentName() + " / " + dept.getDeptName();
+ }else {
+ return dept.getDeptName();
+ }
+ }
+
+ /**
* 璁剧疆浠诲姟鐨勫彂璧蜂汉&澶勭悊浜� 鍙湁寰呭姙浠诲姟鍜屽凡瀹屾垚浠诲姟鎵嶄細鎺夎繖涓柟娉�
*
* @param taskVO
--
Gitblit v1.8.0