From 4d8ce94d4eecf9c6c5a9546d4cf27930b1d89d5b Mon Sep 17 00:00:00 2001
From: zpl <pzl_7001@163.com>
Date: Sun, 26 Sep 2021 10:56:35 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=97=A5=E7=82=B9=E6=A3=80pd?=
 =?UTF-8?q?a=E6=A0=A1=E9=AA=8C=E7=99=BB=E5=BD=95=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ResourceInspectTaskServiceImpl.java  | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceInspectTaskServiceImpl.java b/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceInspectTaskServiceImpl.java
index e51b03c8..3305d117 100644
--- a/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceInspectTaskServiceImpl.java
+++ b/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceInspectTaskServiceImpl.java
@@ -225,7 +225,12 @@ public class ResourceInspectTaskServiceImpl extends ServiceImpl<ResourceInspectT
 
     @Override
     public ResourceInspectTask getInspectTaskByResource(ResourceInspectTaskDto resourceInspectTaskDto) {
-        resourceInspectTaskDto.setSite(CommonMethods.getSite());
+        String site = CommonMethods.getSite();
+        String currentUser = CommonMethods.getUser();
+        String userBo = HandleEnum.USR.getHandle(site, currentUser);
+
+        resourceInspectTaskDto.setSite(site);
+        resourceInspectTaskDto.setCurrentUser(userBo);
         LocalDateTime now = LocalDateTime.now();
         LocalDateTime compareStart = now.minusHours(now.getHour()).minusMinutes(now.getMinute());
         LocalDateTime compareEnd = compareStart.plusDays(1);
@@ -241,10 +246,6 @@ public class ResourceInspectTaskServiceImpl extends ServiceImpl<ResourceInspectT
             resourceInspectTaskAll.setResourceDescription(resourceInspectTaskList.get(0).getResourceDescription());
             return resourceInspectTaskAll;
         }
-        // 获取任务详情
-        /*if (resourceInspectTaskList.size() > 1){
-            throw BusinessException.build("当前设备当日点检任务不止一个！");
-        }*/
         throw BusinessException.build("未找到当日的点检任务！");
     }