行业类别 安全类别列表筛选

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 ">

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查询-->

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>
 
   <!--查询安全类别-->