fix: 修复拉力查询为空的问题

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());
+                if (last != null) {
-                last.setPhase(terminal.getPhase());
+                    last.setCmdid(terminal.getCmdid());
-                terminal.setLastWeathers(last);
+                    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());
+                if (last != null) {
-                last.setPhase(terminal.getPhase());
+                    last.setCmdid(terminal.getCmdid());
-                terminal.setLastLeadPulls(last);
+                    last.setPhase(terminal.getPhase());
+                    terminal.setLastLeadPulls(last);
+                }
             }
         }
         return ResponseReult.success(result);