修改机构/人员导出排序按照序号排序后再按照机构简称排序

soc-modules/soc-modules-system/src/main/resources/mapper/system/SysOrgMapper.xml

@@ -891,7 +891,8 @@ and
             FIND_IN_SET( c.affiliated_bank, #{findInSetOrder} ),
             c.is_lock,
             isnull( c.sort ),
-            c.sort
+            c.sort,
+            c.short_name
     </select>
     <select id="getReachNumber" resultType="java.lang.Integer">
         select SUM(a.size) from (select org_id,if(count(*) > 0,1,0) as size from  sys_org_physical_defense_construction where standard in (1,2) and type = 1 GROUP BY org_id) a
@@ -1444,7 +1445,8 @@ and
             FIND_IN_SET( b.affiliated_bank, #{findInSetOrder} ),
             b.is_lock,
             isnull( b.sort ),
-            b.sort
+            b.sort,
+            b.short_name
     </select>
     <select id="exportDefenseDetailExtend" resultType="com.xunmei.system.util.OrgPhysicalDefenseConstructionDetailExport">
         SELECT
@@ -1487,7 +1489,8 @@ and
             FIND_IN_SET( b.affiliated_bank, #{findInSetOrder} ),
             b.is_lock,
             isnull( b.sort ),
-            b.sort
+            b.sort,
+            b.short_name
     </select>
 
 </mapper>

soc-modules/soc-modules-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -718,7 +718,8 @@
             FIND_IN_SET( o.affiliated_bank, #{findInSetOrder} ),
             o.is_lock,
             isnull( o.sort ),
-            o.sort
+            o.sort,
+            o.short_name
     </select>
     <select id="selectCountByNames" resultType="java.lang.String">
         select u.name from sys_user u where u.deleted=0 and u.name in
@@ -756,7 +757,8 @@
             FIND_IN_SET( c.affiliated_bank, #{findInSetOrder} ),
             c.is_lock,
             isnull( c.sort ),
-            c.sort
+            c.sort,
+            c.short_name
     </select>
 
     <select id="checkUserPermission" resultType="Long">