From c51c4e02934cefa2386e37ab943a818594dbbef8 Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: 星期五, 21 六月 2024 10:02:29 +0800
Subject: [PATCH] 临时提交

---
 src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java |   13 +++++++++++--
 1 files changed, 11 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 2c410ea..2c77813 100644
--- a/src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java
+++ b/src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java
@@ -373,8 +373,17 @@
                         CJTaskFromWork.setCheckCycleUnit("年");
                     }
                     //获取用户信息
-                    User createUser = trUserService.getUserByLoginName(jobById.getCreateBy());
-                    User updateUser = trUserService.getUserByLoginName(jobById.getUpdateBy());
+                    User createUser = new User();
+                    User updateUser = new User();
+                    createUser = trUserService.getUserByLoginName(jobById.getCreateBy());
+                    if(ObjectUtils.isEmpty(createUser)){
+                        createUser = trUserService.getUserByName(jobById.getCreateBy());
+                    }
+
+                    updateUser = trUserService.getUserByLoginName(jobById.getUpdateBy());
+                    if(ObjectUtils.isEmpty(updateUser)){
+                        updateUser = trUserService.getUserByName(jobById.getUpdateBy());
+                    }
 
                     //封装上报昌吉州任务配置数据
                     CJTaskFromWork.setId(work.getJobUuid());

--
Gitblit v1.9.2