From 56305b8f891eebb2cfd975500282150516c33876 Mon Sep 17 00:00:00 2001
From: tangwei <tangwei0654@163.com>
Date: Tue, 28 Jul 2026 14:01:39 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../qgc_base/service/impl/MsWarnRuleBServiceImpl.java     | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/MsWarnRuleBServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/MsWarnRuleBServiceImpl.java
index a659a2a8..52c17142 100644
--- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/MsWarnRuleBServiceImpl.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/MsWarnRuleBServiceImpl.java
@@ -173,8 +173,10 @@ public class MsWarnRuleBServiceImpl extends ServiceImpl<MsWarnRuleBMapper, MsWar
             paramMap.put("ruleType", dbRuleType);
         }
 
+        String orderBy="\nORDER BY t2.TB_ID";
+
         // 组装完整 SQL
-        String sql = selectClause + fromJoin + condition + "\n" + groupByClause;
+        String sql = selectClause + fromJoin + condition + "\n" + groupByClause + orderBy;
 
         return microservicDynamicSQLMapper.getAllListWithResultType(sql, paramMap, WarnYsVo.class);
     }
@@ -457,7 +459,9 @@ public class MsWarnRuleBServiceImpl extends ServiceImpl<MsWarnRuleBMapper, MsWar
                 List<MsWarnRuleDetailB> detailGroup = warnLevelMap.get(warnLevel);
                 List<WarnYsVo> ysVoList = new ArrayList<>();
                 MsWarnRuleDetailB first = detailGroup.getFirst();
-                detailVo.setLvl(first.getLvl().toString());
+                if (first != null && first.getLvl() != null) {
+                    detailVo.setLvl(first.getLvl().toString());
+                }
                 detailVo.setWarnLevel(first.getWarnLevel());
 //                detailVo.setLvlName(first.n);
 //                BeanUtils.copyProperties(first, detailVo);