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;
 	}
 }