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 // } /*如何为空前端没传,查询所有*/ List device = new ArrayList<>(); + device = roleEngineerDevService.getDevice(); if(StringUtils.isEmpty(appProjectQueryParm.getEngineeringId())){ List 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 topTemperature = commonService.getTopTemperature(collect.get(0).getLineId(), "apf_data", "Apf_Temp_Env"); List result = new ArrayList<>(); - for(int i = 0; i Objects.equals(tem.getClDid(), finalI + "")).findFirst().orElse(new StatisticalDataDTO());