From c86166dfb94b9c9b6b834e31fe3c85221f6644fa Mon Sep 17 00:00:00 2001 From: zy <82248909@qq.com> Date: Mon, 1 Dec 2025 11:54:45 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jeecg/modules/appmana/controller/BigScreenController.java | 2 +- .../system/applet/controller/SurvStationInfoController.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/BigScreenController.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/BigScreenController.java index 87bc49b..6bdb4d5 100644 --- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/BigScreenController.java +++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/BigScreenController.java @@ -830,7 +830,7 @@ public class BigScreenController { List equList = zhibiaoService.getAllChemical(deployList); if(!equList.isEmpty()){ - zhibiaoMap = equList.stream().collect(Collectors.groupingBy(ScEquZhibiao::getEquId)); + zhibiaoMap.putAll(equList.stream().collect(Collectors.groupingBy(ScEquZhibiao::getEquId))); } if(PollutionConstants.SOIL_SURV.equals(survDeviceDeploy.getDeployType())){//土壤设备 SurvTransdataSoilVo transdataSoil = transdataSoilService.getNewestData(survDeviceDeploy.getDeployCode()); diff --git a/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/controller/SurvStationInfoController.java b/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/controller/SurvStationInfoController.java index 113a695..68a6be9 100644 --- a/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/controller/SurvStationInfoController.java +++ b/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/controller/SurvStationInfoController.java @@ -235,7 +235,7 @@ public class SurvStationInfoController { } List equList = zhibiaoService.getShowedChemical(deployList); if(!equList.isEmpty()){ - zhibiaoMap = equList.stream().collect(Collectors.groupingBy(ScEquZhibiao::getEquId)); + zhibiaoMap.putAll(equList.stream().collect(Collectors.groupingBy(ScEquZhibiao::getEquId))); TransZhiBiaoVo transZhiBiaoVo = new TransZhiBiaoVo(); transZhiBiaoVo.setZhibiaos(equList); allSurv = zhAdminFeignClient.translatePollution(transZhiBiaoVo);