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

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

@@ -298,8 +298,8 @@
         select
         OPERATION_POINT_ID "id",
         OPERATION_POINT_ID "value",
-        OPERATION_POINT_NAME "label",
-        OPERATION_POINT_NAME "text"
+        OPERATION_POINT_CODE || '-' || OPERATION_POINT_NAME "label",
+        OPERATION_POINT_CODE || '-' || OPERATION_POINT_NAME "text"
 
         from RMS_OPERATION_POINT
         <where>
@@ -314,7 +314,7 @@
                 AND OPERATION_POINT_ID =  #{shippingPointId}
             </if>
             <if test="index!=null and index!=''">
-                AND REGEXP_LIKE(OPERATION_POINT_NAME, #{index})
+                AND REGEXP_LIKE(OPERATION_POINT_CODE || OPERATION_POINT_NAME, #{index})
             </if>
             <if test="sourceFlag != null and sourceFlag !=''">
                 AND ALTERNATE_FIELDS1 = #{sourceFlag}
@@ -326,8 +326,8 @@
         UNION select
         OPERATION_POINT_ID "id",
         OPERATION_POINT_ID "value",
-        OPERATION_POINT_NAME "label",
-        OPERATION_POINT_NAME "text"
+        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="," >