From 0fc6f0490c0a60cd9ce21fdae2e0f4cfdaa0c0ca Mon Sep 17 00:00:00 2001 From: huangfeng Date: Wed, 22 May 2024 09:57:38 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=8B=89=E5=8A=9B?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=B8=BA=E7=A9=BA=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/TerminalExtController.java | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalExtController.java b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalExtController.java index c54acdb..8042afd 100644 --- a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalExtController.java +++ b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalExtController.java @@ -152,9 +152,11 @@ public class TerminalExtController extends BaseController { if (!CollectionUtils.isEmpty(result.getList())) { for (View_Dy_Line_Tower_Terminals terminal : result.getList()) { Weathers last = weatherService.getLast(terminal.getId()); - last.setCmdid(terminal.getCmdid()); - last.setPhase(terminal.getPhase()); - terminal.setLastWeathers(last); + if (last != null) { + last.setCmdid(terminal.getCmdid()); + last.setPhase(terminal.getPhase()); + terminal.setLastWeathers(last); + } } } return ResponseReult.success(result); @@ -173,9 +175,11 @@ public class TerminalExtController extends BaseController { if (!CollectionUtils.isEmpty(result.getList())) { for (View_Dy_Line_Tower_Terminals terminal : result.getList()) { LeadPulls last = leadPullsService.getLast(terminal.getId()); - last.setCmdid(terminal.getCmdid()); - last.setPhase(terminal.getPhase()); - terminal.setLastLeadPulls(last); + if (last != null) { + last.setCmdid(terminal.getCmdid()); + last.setPhase(terminal.getPhase()); + terminal.setLastLeadPulls(last); + } } } return ResponseReult.success(result);