From c4ab6a24d2825f11a0de0f165667dc533c458a01 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期五, 21 三月 2025 10:57:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 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 439f6bc..47438f0 100644
--- a/business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java
@@ -934,6 +934,7 @@
* @param result
*/
public void getTodoTaskList(String projectId, String processInsId, String taskName, int pageSize, int pageNum, Result result) {
+
TaskQuery taskQuery = taskService.createTaskQuery()
.active()
.processInstanceId(processInsId)
@@ -1247,7 +1248,14 @@
taskVO.getHandlerUnitId().add(sysUser.getDept().getDeptId());
taskVO.getHandlerUnitName().add(sysUser.getDept().getDeptName());
taskVO.getPromoterName().add(this.getUserShowName(sysUser));
- taskVO.getPromoterUnitName().add(sysUser.getDept().getDeptName());
+// if (sysUser.getDept().getAncestors())
+ String[] str = sysUser.getDept().getAncestors().split(",");
+ if (str.length >= 4){
+ taskVO.getPromoterUnitName().add(sysUser.getDept().getParentName() +"-"+sysUser.getDept().getDeptName());
+ }else {
+ taskVO.getPromoterUnitName().add(sysUser.getDept().getDeptName());
+ }
+
}
}
// 缁戝畾鐨勬槸瑙掕壊鎴栬�呴儴闂�
@@ -1262,7 +1270,13 @@
taskVO.getHandlerUnitId().add(dept.getDeptId());
taskVO.getHandlerUnitName().add(dept.getDeptName());
taskVO.getPromoterName().add(this.getDeptLeaderShowName(dept));
- taskVO.getPromoterUnitName().add(dept.getDeptName());
+ String[] str = dept.getAncestors().split(",");
+ if (str.length >= 4){
+ taskVO.getPromoterUnitName().add(dept.getParentName() +"-"+dept.getDeptName());
+ }else {
+ taskVO.getPromoterUnitName().add(dept.getDeptName());
+ }
+
}
}
} else {
--
Gitblit v1.8.0