From c8f667a82763661939045f87a3f163882de1632e Mon Sep 17 00:00:00 2001
From: ty <1577900710@qq.com>
Date: Wed, 29 May 2024 16:16:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=EF=BC=9A=E5=91=8A=E8=AD=A6?=
 =?UTF-8?q?=E5=A4=84=E7=90=86=E8=AE=B0=E5=BD=95=E4=B8=AD=E7=9A=84=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=E4=BA=BA=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/hnac/hzims/alarm/show/mapper/AlarmHandleMapper.xml    |  2 +-
 .../java/com/hnac/hzims/alarm/show/wrapper/HandleWrapper.java | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/mapper/AlarmHandleMapper.xml b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/mapper/AlarmHandleMapper.xml
index 110909c..029edcc 100644
--- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/mapper/AlarmHandleMapper.xml
+++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/mapper/AlarmHandleMapper.xml
@@ -4,7 +4,7 @@
 
 
     <select id="selectHandlePage" resultType="com.hnac.hzims.alarm.config.vo.AlarmHandleVo">
-        SELECT H.*,S.NAME AS STATION_NAME,F.PROCESS_INSTANCE_ID
+        SELECT H.*,S.NAME AS STATION_NAME,F.PROCESS_INSTANCE_ID,F.HANDLE_USER_NAME as userName
         FROM HZIMS_ALARM_HANDLE H
         LEFT JOIN HZIMS_OPERATION.HZIMS_STATION S ON H.STATION_CODE = S.CODE
         LEFT JOIN HZIMS_ALARM_HANDLE_FLOW F ON H.ALARM_ID = F.ALARM_ID
diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/wrapper/HandleWrapper.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/wrapper/HandleWrapper.java
index 4301ec9..bbb9c23 100644
--- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/wrapper/HandleWrapper.java
+++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/wrapper/HandleWrapper.java
@@ -1,6 +1,7 @@
 package com.hnac.hzims.alarm.show.wrapper;
 
 import com.hnac.hzims.alarm.config.vo.AlarmHandleVo;
+import com.hnac.hzims.common.logs.utils.StringUtils;
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.ObjectUtil;
 import org.springblade.system.user.cache.UserCache;
@@ -17,11 +18,13 @@ public class HandleWrapper extends BaseEntityWrapper<AlarmHandleVo,AlarmHandleVo
 
 	@Override
 	public AlarmHandleVo entityVO(AlarmHandleVo entity) {
-		User createUser = UserCache.getUser(entity.getCreateUser());
-		if(ObjectUtil.isEmpty(createUser)){
-			return entity;
+		if (1==entity.getHandleWay()|| StringUtils.isNotEmpty(entity.getUserName())) {
+			User createUser = UserCache.getUser(entity.getCreateUser());
+			if (ObjectUtil.isEmpty(createUser)) {
+				return entity;
+			}
+			entity.setUserName(createUser.getRealName());
 		}
-        entity.setUserName(createUser.getRealName());
 		return entity;
 	}
 }