From 6065017dff96a427ef922022a4391808f878d06b Mon Sep 17 00:00:00 2001
From: wxyclub <tjzdwxy@163.com>
Date: Thu, 23 Nov 2023 00:09:59 +0800
Subject: [PATCH] =?UTF-8?q?bug:=20=E5=9B=BD=E5=86=85=E5=A4=96=E6=94=BF?=
 =?UTF-8?q?=E7=AD=96=E6=8E=92=E5=BA=8F=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/SarLawsStandInfoController.java                 | 3 +++
 .../mybatis/mapper/sarLawsStandInfo/SarLawsStandInfoMapper.xml | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/controller/SarLawsStandInfoController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/controller/SarLawsStandInfoController.java
index 28b633f6..6427da14 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/controller/SarLawsStandInfoController.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/controller/SarLawsStandInfoController.java
@@ -103,6 +103,9 @@ public class SarLawsStandInfoController extends BaseController<SarLawsStandInfo>
                         break;
                 }
             }
+        } else {
+            page.setOrderByA("SAR_LAWS_STAND_INFO.LAWS_NAME");
+            page.setOrder1("asc");
         }
 
 
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsStandInfo/SarLawsStandInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsStandInfo/SarLawsStandInfoMapper.xml
index 51c316a5..b0c199f0 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsStandInfo/SarLawsStandInfoMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsStandInfo/SarLawsStandInfoMapper.xml
@@ -466,7 +466,7 @@
              </when>
          <otherwise>
              <if test='orderByA != null and orderByA != "" and order1 != null and order1 != ""'>
-                 ${orderByA} ${order1},
+                 ${orderByA} is null desc, ${orderByA} ${order1},
              </if>
          </otherwise>
          </choose>