Redeem hai 1 ano
pai
achega
2802be099e

+ 3 - 3
src/main/resources/application-prod.yml

@@ -26,16 +26,16 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.90.202:80}
   AmsFeign:
-    url: ${AMSFEIGN_URL:172.16.90.202:8079}
+    url: ${AMSFEIGN_URL:172.16.90.202:80}
   TmsFeign:
     url: ${TMSFEIGN_URL:172.16.90.202:80}
   WMSFeign:
     url: ${WMSFEIGN_URL:172.16.90.202:80}
   RmsFeign:
-    url: ${RMSFEIGN_URL:172.16.90.202:8060}
+    url: ${RMSFEIGN_URL:172.16.90.202:80}
 #    url: ${RMSFEIGN_URL:localhost:8060}
   EmsFeign:
-    url: ${EMSFEIGN_URL:172.16.90.202:8000}
+    url: ${EMSFEIGN_URL:172.16.90.202:80}
   SSOFeign:
     url: ${SSOFEIGN_URL:172.16.90.202:80}
   WebSocketFeign:

+ 4 - 1
src/main/resources/com/steerinfo/dil/mapper/UniversalMapper.xml

@@ -300,7 +300,6 @@
         OPERATION_POINT_ID "value",
         OPERATION_POINT_CODE || '-' || OPERATION_POINT_NAME "label",
         OPERATION_POINT_CODE || '-' || OPERATION_POINT_NAME "text"
-
         from RMS_OPERATION_POINT
         <where>
             DELETED = 0
@@ -320,6 +319,7 @@
                 AND ALTERNATE_FIELDS1 = #{sourceFlag}
             </if>
         </where>
+        order by LENGTH(OPERATION_POINT_CODE || '-' || OPERATION_POINT_NAME)
         FETCH NEXT 10 ROWS ONLY
     )
     <if test="id!=null and id.size>0">
@@ -388,6 +388,9 @@
             <if test="index!=null and index!=''">
                 AND REGEXP_LIKE("label", #{index})
             </if>
+            <if test="personnelName!=null and personnelName!=''">
+                AND REGEXP_LIKE("label", #{personnelName})
+            </if>
             <if test="lastIndex!=null">
                 and "personnelId" &lt; #{lastIndex}
             </if>