Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_lc into develop

tuoheng-admin/src/main/java/com/tuoheng/admin/entity/vo/WarningDetailsVO.java

@@ -44,7 +44,7 @@ public class WarningDetailsVO {
     /**
      * 处理人
      */
-    private Integer checkUser;
+    private String checkUser;
 
     /**
      * 处理时间

tuoheng-admin/src/main/java/com/tuoheng/admin/service/warning/details/WarningDetailsService.java

@@ -22,6 +22,7 @@ import com.tuoheng.common.exception.ServiceException;
 import com.tuoheng.common.utils.JsonResult;
 import com.tuoheng.common.utils.StringUtils;
 import com.tuoheng.system.entity.User;
+import com.tuoheng.system.mapper.UserMapper;
 import com.tuoheng.system.utils.ShiroUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -52,6 +53,9 @@ public class WarningDetailsService {
     @Autowired
     private ThMissionMapper missionMapper;
 
+    @Autowired
+    private UserMapper userMapper;
+
     public JsonResult details(Integer id) {
        User user = ShiroUtils.getUserInfo();
        Integer tenantId = user.getTenantId();
@@ -125,7 +129,10 @@ public class WarningDetailsService {
             vo.setCheckResult(warning.getCheckResult());
         }
         if(warning.getCheckUser() != null){
-            vo.setCheckUser(warning.getCheckUser());
+            User userInfo = userMapper.selectById(warning.getCheckUser());
+            if(StringUtils.isNotEmpty(userInfo.getRealname())){
+                vo.setCheckUser(userInfo.getRealname());
+            }
         }
         if(warning.getCheckTime() != null){
             vo.setCheckTime(warning.getCheckTime());