123

vehicle/src/main/resources/mapper/VehicleMapper.xml

@@ -12,6 +12,7 @@
 
     <select id="getByPage" parameterType="java.util.Map"
             resultType="com.xinxincaravan.caravan.vehicle.vo.QueryVehicleVo">
+        SELECT r.* FROM (
         select  DISTINCT v.`id`,
         v.`code`,
         v.`status`,
@@ -118,10 +119,12 @@
         )
          </if>
         order by v.code
+        ) r ORDER BY r.subBranchName
     </select>
 
     <select id="getByPageNotAllData" parameterType="java.util.Map"
             resultType="com.xinxincaravan.caravan.vehicle.vo.QueryVehicleVo">
+        SELECT r.* FROM (
         select DISTINCT  v.`id`,
         v.`code`,
         v.`status`,
@@ -244,6 +247,7 @@
             )
         </if>
         order by v.code
+        ) r ORDER BY r.subBranchName
     </select>
 
     <select id="lockByCode" resultType="com.xinxincaravan.caravan.vehicle.entity.Vehicle"