From 6372ca22090e731803a5ad40092da600351a5edb Mon Sep 17 00:00:00 2001
From: ty <1577900710@qq.com>
Date: Tue, 2 Apr 2024 20:50:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=B7=A1=E6=A3=80=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E4=BA=BA=E5=91=98=E5=A7=93=E5=90=8D=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hnac/hzinfo/inspect/task/job/service/TaskJobService.java |  7 +++++++
 .../java/com/hnac/hzinfo/inspect/task/mapper/TaskMapper.xml  | 12 +++++++++---
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/job/service/TaskJobService.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/job/service/TaskJobService.java
index 82e65be..b5311ca 100644
--- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/job/service/TaskJobService.java
+++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/job/service/TaskJobService.java
@@ -31,6 +31,7 @@ import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.tool.utils.CollectionUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.ObjectUtil;
+import org.springblade.system.user.cache.UserCache;
 import org.springblade.system.user.entity.User;
 import org.springblade.system.user.feign.IUserClient;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -104,6 +105,12 @@ public class TaskJobService {
         TaskUserEntity taskUserEntity = TaskUserEntity.builder().taskId(taskId).userId(planUserId)
                 .claimStatus(ClaimStatusEnum.UN_COLLECT.getStatus()).build();
         taskUserEntity.setTenantId(tenantId);
+        User user = UserCache.getUser(planUserId);
+        if (ObjectUtil.isNotEmpty(user)&&StringUtils.isNotBlank(user.getName())) {
+            taskUserEntity.setUserName(user.getName());
+        }else {
+            taskUserEntity.setUserName("");
+        }
         return taskUserEntity;
     }
 
diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/mapper/TaskMapper.xml b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/mapper/TaskMapper.xml
index 59ff1ce..fb991ca 100644
--- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/mapper/TaskMapper.xml
+++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/mapper/TaskMapper.xml
@@ -180,15 +180,21 @@
         order by t.UPDATE_TIME desc
     </select>
     <select id="getAllPageList" parameterType="com.hnac.hzinfo.inspect.task.vo.TaskListQuery" resultType="com.hnac.hzinfo.inspect.task.vo.TaskVo">
-        SELECT t.*,u.USER_ID as userIds,u.USER_NAME as userNames
+        SELECT
+        t.*, b.USER_ID as userIds,
+        (SELECT group_concat(u.user_name) FROM HZ_ST_EX_TASK_USER u WHERE t.ID=u.TASK_ID
+        <if test="task.userId != null ">
+            and u.USER_ID=#{task.userId}
+        </if>) AS userNames
         from
-            HZ_ST_EX_TASK t
-            LEFT JOIN HZ_ST_EX_TASK_USER u on t.ID=u.TASK_ID and u.IS_DELETED=0
+        HZ_ST_EX_TASK t
+        LEFT JOIN HZ_ST_EX_TASK_USER b on t.ID=b.TASK_ID and b.IS_DELETED=0
         where t.IS_DELETED=0
         <if test="task.userId != null ">
             and u.USER_ID=#{task.userId}
         </if>
         <include refid="getTaskListSql"></include>
+        GROUP BY t.id
         order by t.UPDATE_TIME desc
     </select>
     <select id="getAllExportList"  resultType="com.hnac.hzinfo.inspect.task.vo.TaskVo">