From 8d2f2f78c0c02205b91946f4f5cfdc03bcb3383a Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 10 四月 2025 16:25:21 +0800
Subject: [PATCH] 项目法人单位保存bug
---
flowable/src/main/java/com/ycl/service/common/TaskCommonService.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 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 ed65499..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;
/**
@@ -321,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