From 338735b132f4bd6c175ced10362c989b2e1f34d5 Mon Sep 17 00:00:00 2001
From: huangzj <826100833@qq.com>
Date: Thu, 31 Aug 2023 13:58:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9A=82=E9=99=8D=E4=BA=8B=E4=BB=B6=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/njcn/csdevice/service/impl/AppProjectServiceImpl.java  | 3 ++-
 .../njcn/csharmonic/service/impl/TemperatureServiceImpl.java   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/AppProjectServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/AppProjectServiceImpl.java
index f21b5d7..485cb40 100644
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/AppProjectServiceImpl.java
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/AppProjectServiceImpl.java
@@ -262,9 +262,10 @@ class AppProjectServiceImpl extends ServiceImpl<AppProjectMapper, AppProjectPO>
 //        }
         /*如何为空前端没传，查询所有*/
         List<String> device = new ArrayList<>();
+        device = roleEngineerDevService.getDevice();
         if(StringUtils.isEmpty(appProjectQueryParm.getEngineeringId())){
             List<String> roleengineer = roleEngineerDevService.getRoleengineer();
-            device = roleEngineerDevService.getDevice();
+
             appProjectQueryParm.setEngineeringIds(roleengineer);
 
             if(CollectionUtils.isEmpty(roleengineer)){
diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/TemperatureServiceImpl.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/TemperatureServiceImpl.java
index 171f360..288b839 100644
--- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/TemperatureServiceImpl.java
+++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/TemperatureServiceImpl.java
@@ -51,7 +51,7 @@ public class TemperatureServiceImpl implements TemperatureService {
         }
         List<StatisticalDataDTO> topTemperature = commonService.getTopTemperature(collect.get(0).getLineId(), "apf_data", "Apf_Temp_Env");
         List<StatisticalDataDTO> result = new ArrayList<>();
-        for(int i = 0; i <moduleNumber; i++){
+        for(int i = 0; i <=moduleNumber; i++){
             StatisticalDataDTO statisticalData = new StatisticalDataDTO();
             int finalI = i;
             StatisticalDataDTO statisticalDataDTO = topTemperature.stream().filter(tem -> Objects.equals(tem.getClDid(), finalI + "")).findFirst().orElse(new StatisticalDataDTO());