From 1b9936ba920d65df09ab8dba79c6252568ee26e4 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 26 三月 2025 12:16:02 +0800
Subject: [PATCH] 任务统计bug
---
flowable/src/main/java/com/ycl/service/common/TaskCommonService.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/flowable/src/main/java/com/ycl/service/common/TaskCommonService.java b/flowable/src/main/java/com/ycl/service/common/TaskCommonService.java
index 240eba2..a789590 100644
--- a/flowable/src/main/java/com/ycl/service/common/TaskCommonService.java
+++ b/flowable/src/main/java/com/ycl/service/common/TaskCommonService.java
@@ -11,6 +11,7 @@
import com.ycl.domain.vo.FormDetailVO;
import com.ycl.flow.FindNextNodeUtil;
import com.ycl.service.ISysFormService;
+import com.ycl.system.service.ISysDeptService;
import com.ycl.system.service.ISysDictDataService;
import com.ycl.system.service.ISysDictTypeService;
import com.ycl.system.service.ISysUserService;
@@ -47,6 +48,7 @@
private final TaskService taskService;
private final HistoryService historyService;
private final ISysUserService sysUserService;
+ private final ISysDeptService deptService;
private final ISysDictTypeService sysDictDService;
/**
@@ -110,7 +112,7 @@
formDetailVO.setCanJump(this.checkHasExeProperty(currentElement.getExtensionElements().get("properties"), ProcessConstants.EXTENSION_PROPERTY_CAN_JUMP_TEXT));
formDetailVO.setCanWait(this.checkHasExeProperty(currentElement.getExtensionElements().get("properties"), ProcessConstants.EXTENSION_PROPERTY_CAN_WAIT_TEXT));
formDetailVO.setCanHangup(this.checkHasExeProperty(currentElement.getExtensionElements().get("properties"), ProcessConstants.EXTENSION_PROPERTY_CAN_HANGUP_TEXT));
-
+ formDetailVO.setUserTask(currentElement);
defKeys.add(formDetailVO);
this.beforeNodeInfo(currentElement, defKeys);
@@ -180,7 +182,9 @@
formDetailVO.setBeforeNodeName(incomingFlow.getSourceFlowElement().getName());
formDetailVO.setCanJump(this.checkHasExeProperty(currentElement.getExtensionElements().get("properties"), ProcessConstants.EXTENSION_PROPERTY_CAN_JUMP_TEXT));
formDetailVO.setCanWait(this.checkHasExeProperty(currentElement.getExtensionElements().get("properties"), ProcessConstants.EXTENSION_PROPERTY_CAN_WAIT_TEXT));
+ formDetailVO.setUserTask((UserTask) incomingFlow.getSourceFlowElement());
defKeys.add(formDetailVO);
+ continue;
} else {
beforeNodeInfo(incomingFlow.getSourceFlowElement(), defKeys);
}
@@ -196,7 +200,9 @@
formDetailVO.setBeforeNodeName(incomingFlow.getSourceFlowElement().getName());
formDetailVO.setCanJump(this.checkHasExeProperty(currentElement.getExtensionElements().get("properties"), ProcessConstants.EXTENSION_PROPERTY_CAN_JUMP_TEXT));
formDetailVO.setCanWait(this.checkHasExeProperty(currentElement.getExtensionElements().get("properties"), ProcessConstants.EXTENSION_PROPERTY_CAN_WAIT_TEXT));
+ formDetailVO.setUserTask((UserTask) incomingFlow.getSourceFlowElement());
defKeys.add(formDetailVO);
+ continue;
} else {
beforeNodeInfo(incomingFlow.getSourceFlowElement(), defKeys);
}
@@ -207,7 +213,7 @@
/**
- * 鑾峰彇褰撳墠鑺傜偣鐨勪笂涓�鑺傜偣id锛屼笉鍙嶆倲褰撳墠鑺傜偣淇℃伅锛屽鏋滃墠闈㈡槸骞惰锛岄偅涔堜細杩斿洖澶氫釜
+ * 鑾峰彇褰撳墠鑺傜偣鐨勪笂涓�鑺傜偣id锛屼笉杩斿洖褰撳墠鑺傜偣淇℃伅锛屽鏋滃墠闈㈡槸骞惰锛岄偅涔堜細杩斿洖澶氫釜
*
* @param processDefId 娴佺▼瀹氫箟id
* @param currentNodeDefId 褰撳墠鑺傜偣瀹氫箟id
@@ -317,14 +323,17 @@
* @return
*/
public List<String> getCurrentUserGroups() {
- String deptId = "dept:" + SecurityUtils.getLoginUser().getDeptId();
List<String> roleIds;
if (CollectionUtils.isEmpty(SecurityUtils.getLoginUser().getUser().getRoles())) {
roleIds = new ArrayList<>(1);
} else {
roleIds = SecurityUtils.getLoginUser().getUser().getRoles().stream().map(role -> role.getRoleId() + "").collect(Collectors.toList());
}
- roleIds.add(deptId);
+ if (Objects.nonNull(SecurityUtils.getLoginUser().getDeptId())) {
+ List<Long> deptIds = deptService.getChildIds(SecurityUtils.getLoginUser().getDeptId());
+ List<String> deptIdList = deptIds.stream().map(id -> "dept:" + id).collect(Collectors.toList());
+ roleIds.addAll(deptIdList);
+ }
return roleIds;
}
--
Gitblit v1.8.0