From 45abdb8317c552437e5869e85cebd5aa475cb9f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9F=A9=E5=9B=BD=E4=B8=9C?= <mythxb@qq.com>
Date: Thu, 16 Feb 2023 10:43:42 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=8C=E4=B8=9A=E7=B1=BB=E5=88=AB=20?=
 =?UTF-8?q?=E5=AE=89=E5=85=A8=E7=B1=BB=E5=88=AB=E5=88=97=E8=A1=A8=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/check/ChkGovBillMapper.xml       | 3 ++-
 .../src/main/resources/mapper/ent/BaseInClassMapper.xml        | 3 +--
 .../src/main/resources/mapper/ent/BaseSafeClassMapper.xml      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/inventory-dao/src/main/resources/mapper/check/ChkGovBillMapper.xml b/inventory-dao/src/main/resources/mapper/check/ChkGovBillMapper.xml
index 2a2e18d..b3c5632 100644
--- a/inventory-dao/src/main/resources/mapper/check/ChkGovBillMapper.xml
+++ b/inventory-dao/src/main/resources/mapper/check/ChkGovBillMapper.xml
@@ -549,7 +549,8 @@
   </select>
 
   <select id="selectList" resultMap="BaseResultMap">
-    select cb.*,GROUP_CONCAT(sys.EntName) as 'EntName' from ChkGovBill cb
+    select cb.*,GROUP_CONCAT(sys.EntName) as 'EntName'
+    from ChkGovBill cb
     left join SysEnterprise  sys on  FIND_IN_SET( sys.SysEnterpriseId,cb.SysEnterpriseId)
     where del_state = 1
     <if test="title != null and '' != title ">
diff --git a/inventory-dao/src/main/resources/mapper/ent/BaseInClassMapper.xml b/inventory-dao/src/main/resources/mapper/ent/BaseInClassMapper.xml
index a6e3ed4..7de98cf 100644
--- a/inventory-dao/src/main/resources/mapper/ent/BaseInClassMapper.xml
+++ b/inventory-dao/src/main/resources/mapper/ent/BaseInClassMapper.xml
@@ -396,8 +396,7 @@
     FROM `BaseInClass` bc
         LEFT JOIN BaseInClass sp ON bc.`SuperInId` = sp.`BaseInClassId`
     WHERE bc.`IndustryClassName` LIKE #{condition}
-    and bc.in_type = #{inType}
-    ORDER BY bc.`IndustryClassName` ASC
+    ORDER BY bc.SysLevel ASC,bc.SuperInId DESC, bc.`IndustryClassName` ASC
   </select>
 
   <!--通过父级id查询-->
diff --git a/inventory-dao/src/main/resources/mapper/ent/BaseSafeClassMapper.xml b/inventory-dao/src/main/resources/mapper/ent/BaseSafeClassMapper.xml
index c4ef888..c1376af 100644
--- a/inventory-dao/src/main/resources/mapper/ent/BaseSafeClassMapper.xml
+++ b/inventory-dao/src/main/resources/mapper/ent/BaseSafeClassMapper.xml
@@ -360,7 +360,7 @@
     FROM BaseSafeClass bc
         LEFT JOIN BaseSafeClass sp ON bc.`SuperSafeClassId` = sp.`BaseSafeClassId`
     WHERE bc.`SafeClassName` LIKE #{condition}
-    ORDER BY bc.`SafeClassCode` ASC
+    ORDER BY bc.`SuperSafeClassId` ASC
   </select>
 
   <!--查询安全类别-->