diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/SjProjectSafetyServiceImpl.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/SjProjectSafetyServiceImpl.java
index 12014f5..7a2291e 100644
--- a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/SjProjectSafetyServiceImpl.java
+++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/SjProjectSafetyServiceImpl.java
@@ -37,9 +37,11 @@ public class SjProjectSafetyServiceImpl implements SjProjectSafetyService {
         List<SjProjectSafety> sjProjectSafeties = mapper.selectProSafetyVideo(o);
         sjProjectSafeties.forEach(data -> {
             Result<SysFile> result= remoteFileService.getFileBast64(data.getImagePath(), SecurityConstants.INNER);
-            data.setImagePath(result.getData().getUrl());
+            if(result != null && Result.isSuccess(result)){
+                data.setImagePath(result.getData().getUrl());
+            }
         });
-        return mapper.selectProSafetyVideo(o);
+        return sjProjectSafeties;
     }
 
     @Override
diff --git a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/SjProjectEnvironmentMapper.xml b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/SjProjectEnvironmentMapper.xml
index f062b94..93d3cbc 100644
--- a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/SjProjectEnvironmentMapper.xml
+++ b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/SjProjectEnvironmentMapper.xml
@@ -41,7 +41,7 @@
       tpd.bid_code = #{bidCode}
       AND tbd.device_code = #{deviceCode}
       AND thdv.create_time IS NOT NULL
-      AND DATE(thdv.create_time) BETWEEN #{startDate} AND #{startDate}
+      AND DATE(thdv.create_time) BETWEEN #{startDate} AND #{endDate}
     ORDER BY currentDay,`hour`
   </select>
 </mapper>