Merge branch 'master' of https://gitee.com/antai-wuliu/ANTAI-API

src/main/resources/com/steerinfo/dil/mapper/UniversalMapper.xml

@@ -293,10 +293,12 @@
         FETCH NEXT 10 ROWS ONLY
     </select>
     <select id="getOperationPointByLike" resultType="java.util.Map">
-    SELECT * FROM (
+    select * from (
+        SELECT * FROM (
         select
         OPERATION_POINT_ID "id",
         OPERATION_POINT_ID "value",
+        OPERATION_POINT_NAME "OPERATION_POINT_NAME",
         OPERATION_POINT_CODE || '-' || OPERATION_POINT_NAME "label",
         OPERATION_POINT_CODE || '-' || OPERATION_POINT_NAME "text"
         from RMS_OPERATION_POINT
@@ -318,21 +320,23 @@
                 AND ALTERNATE_FIELDS1 = #{sourceFlag}
             </if>
         </where>
-        order by LENGTH(OPERATION_POINT_CODE || '-' || OPERATION_POINT_NAME)
+        order by LENGTH(OPERATION_POINT_NAME)
         FETCH NEXT 10 ROWS ONLY
-    )
-    <if test="id!=null and id.size>0">
-        UNION select
-        OPERATION_POINT_ID "id",
-        OPERATION_POINT_ID "value",
-        OPERATION_POINT_CODE || '-' || OPERATION_POINT_NAME "label",
-        OPERATION_POINT_CODE || '-' || OPERATION_POINT_NAME "text"
-        from RMS_OPERATION_POINT
-        where  OPERATION_POINT_ID in
-        <foreach collection="id" item="item"  open="(" close=")" separator="," >
-            #{item}
-        </foreach>
-    </if>
+        )
+        <if test="id!=null and id.size>0">
+            UNION select
+            OPERATION_POINT_ID "id",
+            OPERATION_POINT_ID "value",
+            OPERATION_POINT_NAME "OPERATION_POINT_NAME",
+            OPERATION_POINT_CODE || '-' || OPERATION_POINT_NAME "label",
+            OPERATION_POINT_CODE || '-' || OPERATION_POINT_NAME "text"
+            from RMS_OPERATION_POINT
+            where  OPERATION_POINT_ID in
+            <foreach collection="id" item="item"  open="(" close=")" separator="," >
+                #{item}
+            </foreach>
+        </if>
+      )  order by LENGTH("OPERATION_POINT_NAME")
     </select>
 
     <select id="getPersonnelByLike" resultType="java.util.Map">