sql修改测试

business-service/src/main/resources/mapper/service/BaseCameraManagementMapper.xml

@@ -30,8 +30,6 @@
         FROM
         base_camera_management a join base_railway_management r
         on a.railway_code=r.railway_code
-        ORDER BY
-        CONVERT (r.railway_name USING gbk),a.install_mile
         <where>
             <if test="railwayCode != null and railwayCode != ''">
                 and a.railway_code=#{railwayCode}
@@ -78,6 +76,8 @@
                 </trim>
             </if>
         </where>
+        ORDER BY
+        CONVERT (r.railway_name USING gbk),a.install_mile
     </select>
 
     <select id="countCamera" parameterType="com.ozs.service.entity.vo.MsgAlarmVo" resultType="java.lang.Integer">