修改排序规则

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml

@@ -497,7 +497,9 @@
                 SELECT
                     a.id AS grid_id,
                     a.customer_id,
-                    concat( agency.fullname, '-', a.grid_name ) AS gridName
+                    concat( agency.fullname, '-', a.grid_name ) AS gridName,
+                    a.sort as sort,
+                    agency.fullname as fullName
                 FROM
                     CUSTOMER_GRID a
                 LEFT JOIN (
@@ -521,7 +523,7 @@
                     and a.ABANDON_FLAG='0'
                     AND a.customer_id = #{customerId}
             ) AS c
-         ORDER BY CONVERT ( gridName USING gbk ) ASC
+         ORDER BY fullName,c.sort,CONVERT ( gridName USING gbk ) ASC
         LIMIT #{pageNo}, #{pageSize}
     </select>