From 89e9171332c9799c499d7aee946a046b8e91092d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E7=BE=8E=E5=B9=B3?= <1102247926@qq.com>
Date: Sat, 11 Oct 2025 09:11:08 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BD=E5=90=8D=E5=8D=95=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/nmgs/mapper/WhiteCarnoListMapper.xml    |  5 ++++-
 .../com/nmgs/service/impl/SelectDataImpl.java   | 17 ++++++++---------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/nmgs/mapper/WhiteCarnoListMapper.xml b/src/main/java/com/nmgs/mapper/WhiteCarnoListMapper.xml
index b267c4a..e2ed9c7 100644
--- a/src/main/java/com/nmgs/mapper/WhiteCarnoListMapper.xml
+++ b/src/main/java/com/nmgs/mapper/WhiteCarnoListMapper.xml
@@ -207,6 +207,9 @@
             <if test="params.SVEHICLEID != null and params.SVEHICLEID != ''">
                 AND t.acarno like '%'|| #{params.SVEHICLEID} || '%'
             </if>
+            <if test="params.SVEHICLEIDALL != null and params.SVEHICLEIDALL != ''">
+                AND t.acarno =  #{params.SVEHICLEIDALL}
+            </if>
             <if test="params.SCOMNO != null and params.SCOMNO != ''">
                 AND t.ACCOUNT = #{params.SCOMNO}
             </if>
@@ -279,7 +282,7 @@
                update CARNO_TABLE
                <set>
                    <if test="params.DBType == 1">
-                       BEGDATE = dateadd(day,0,#{params.begdate})
+                       BEGDATE = dateadd(day,0,#{params.begdate}),
                    </if>
                    <if test="params.DBType == 2">
                        BEGDATE=  TO_DATE(#{params.begdate}, 'YYYY-MM-DD HH24:mi:ss'),
diff --git a/src/main/java/com/nmgs/service/impl/SelectDataImpl.java b/src/main/java/com/nmgs/service/impl/SelectDataImpl.java
index 2b33968..bbafa0d 100644
--- a/src/main/java/com/nmgs/service/impl/SelectDataImpl.java
+++ b/src/main/java/com/nmgs/service/impl/SelectDataImpl.java
@@ -44,16 +44,15 @@ public class SelectDataImpl implements ISelectData {
             }
             sql +=" order by a.roadname ";
         } else if("ROAD_STA_STA".equals(selectType)){//自定义白名单全:站站路段,需要排除全部路段
-
-          if("2".equals(dbTYpe)){
-              sql="select a.roadno as VALUE,a.roadname||':'||a.roadno LABEL from ROAD_TABLE a where 1=1 ";
-          }else{
-              sql="select a.roadno as VALUE,concat(a.roadname,':',a.roadno) LABEL from ROAD_TABLE a where 1=1 ";
-          }
-              if(!PubTools.isNull(roadNoSql)){
-                  sql += roadNoSql;
+              if("2".equals(dbTYpe)){
+                  sql="select a.roadno as VALUE,a.roadname||':'||a.roadno LABEL from ROAD_TABLE a where 1=1 ";
+              }else{
+                  sql="select a.roadno as VALUE,concat(a.roadname,':',a.roadno) LABEL from ROAD_TABLE a where 1=1 ";
               }
-            sql +=" order by a.roadname ";
+                  if(!PubTools.isNull(roadNoSql)){
+                      sql += roadNoSql;
+                  }
+                sql +=" order by a.roadname ";
         }  else if ("STANONAME".equals(selectType)) {//站名称
           if("2".equals(dbTYpe)){
               sql = "select a.stano as as VALUE,a.staname||':'||a.stano as LABEL from NAME_TABLE a where 1=1  ";