From c83bd5ccc72512c9935135ff76b7c3f7e81a14b8 Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: Wed, 24 May 2023 15:27:45 +0800
Subject: [PATCH] 检索上报数据时，兼容改名
---
src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java b/src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java
index cf8cd8b..5d1c8bf 100644
--- a/src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java
+++ b/src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java
@@ -465,8 +465,11 @@
if (Integer.valueOf(hiddenDangerCheckPoint.getWhetherDanger()) == 1){
CJRecordFromTask.setCheckStatus("1");// 0-正常；1-存在隐患；2-未处理；3-其他
}
-
- User createUser = trUserService.getUserByLoginName(hiddenDangerCheckById.getCreateBy());
+ User createUser = new User();
+ createUser = trUserService.getUserByLoginName(hiddenDangerCheckById.getCreateBy());
+ if(ObjectUtils.isEmpty(createUser)){
+ createUser = trUserService.getUserByName(hiddenDangerCheckById.getCreateBy());
+ }
User updateUser = trUserService.getUserByLoginName(hiddenDangerCheckById.getUpdateBy());
//封装上报昌吉州的任务数据 todo taskUUid
--
Gitblit v1.9.2