From 317a22981eaea13ab6e23f7356ec1333755eb263 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 15 一月 2025 16:25:50 +0800
Subject: [PATCH] 已完成任务的查询处理人bug
---
business/src/main/java/com/ycl/domain/vo/CustomerTaskVO.java | 10 ++++++++++
system/src/main/java/com/ycl/framework/config/SecurityConfig.java | 1 +
business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java | 8 ++++----
3 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/business/src/main/java/com/ycl/domain/vo/CustomerTaskVO.java b/business/src/main/java/com/ycl/domain/vo/CustomerTaskVO.java
index e14bbd0..b346939 100644
--- a/business/src/main/java/com/ycl/domain/vo/CustomerTaskVO.java
+++ b/business/src/main/java/com/ycl/domain/vo/CustomerTaskVO.java
@@ -97,6 +97,16 @@
private List<String> handlerUnitName;
/**
+ * 瀹為檯澶勭悊浜篿d
+ */
+ private String actualHandlerUserId;
+
+ /**
+ * 瀹為檯澶勭悊浜哄鍚�
+ */
+ private String actualHandlerUserName;
+
+ /**
* 鍔炵悊鏈熼檺
*/
private String timeLimit;
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 cce4972..d650b30 100644
--- a/business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java
@@ -754,8 +754,8 @@
SysUser handlerUser = sysUserService.selectUserById(handlerUserId);
if (Objects.nonNull(handlerUser)) {
- vo.setHandlerId(Arrays.asList(handlerUserId));
- vo.setHandlerName(Arrays.asList(handlerUser.getNickName()));
+ vo.setActualHandlerUserId(hisTaskList.get(0).getAssignee());
+ vo.setActualHandlerUserName(handlerUser.getNickName());
}
vo.setTaskDefinitionKey(hisTaskList.get(0).getTaskDefinitionKey());
this.setPromoterAndHandler(vo, hisTaskList.get(0).getIdentityLinks());
@@ -1053,12 +1053,12 @@
taskVO.setHandlerType(HandlerTypeEnum.USER);
SysUser sysUser = sysUserService.selectUserById(Long.parseLong(identityLink.getUserId()));
if (Objects.nonNull(sysUser)) {
-// taskVO.setHandlerId(sysUser.getUserId());
+ handlerIds.add(sysUser.getUserId());
+ handlerNames.add(sysUser.getNickName());
if (Objects.nonNull(sysUser.getDept())) {
handlerUnitIds.add(sysUser.getDept().getDeptId());
handlerUnitNames.add(sysUser.getDept().getDeptName());
}
-// taskVO.setHandlerName(sysUser.getNickName());
}
// 缁戝畾鐨勬槸瑙掕壊锛屾煡鍑鸿鑹插悕绉�
} else if (StringUtils.isNotBlank(identityLink.getGroupId())) {
diff --git a/system/src/main/java/com/ycl/framework/config/SecurityConfig.java b/system/src/main/java/com/ycl/framework/config/SecurityConfig.java
index d3ebaa3..d5be009 100644
--- a/system/src/main/java/com/ycl/framework/config/SecurityConfig.java
+++ b/system/src/main/java/com/ycl/framework/config/SecurityConfig.java
@@ -115,6 +115,7 @@
// 闈欐�佽祫婧愶紝鍙尶鍚嶈闂�
.antMatchers(HttpMethod.GET, "/flowable-ui", "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()
.antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll()
+ .antMatchers("/common/upload").permitAll()
// 闄や笂闈㈠鐨勬墍鏈夎姹傚叏閮ㄩ渶瑕侀壌鏉冭璇�
.anyRequest().authenticated()
.and()
--
Gitblit v1.8.0