zhouzh 3 gadi atpakaļ
vecāks
revīzija
3c7cc8515a

+ 3 - 1
src/main/resources/bootstrap.yml

@@ -25,6 +25,7 @@ eureka:
 
 openfeign:
 #  正式环境
+
     ColumnDataFeign:
       url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
     AmsFeign:
@@ -50,7 +51,7 @@ openfeign:
     OMSFeign:
       url: ${OMSFEIGN_URL:172.16.33.166:8095}
     RmsFeign:
-      url: ${RMSFEIGN_HRL:localhost:8060}
+      url: ${RMSFEIGN_HRL:172.16.33.166:8060}
 
 # 测试环境
 #  ColumnDataFeign:
@@ -80,6 +81,7 @@ openfeign:
 #  RmsFeign:
 #    url: ${RMSFEIGN_HRL:172.16.33.162:8014}
 
+
 genxml:
   pth: com/a
 cache:

+ 3 - 5
src/main/resources/com/steerinfo/dil/mapper/UniversalMapper.xml

@@ -401,23 +401,21 @@
 
     <!-- 边输边查承运商   -->
     <select id="getCarrierMesByLike" parameterType="string" resultType="java.util.Map">
-        select
-        *
-        from(
         select
             RC.CARRIER_ID "carrierId",
-            RC.CARRIER_NAME "value"
+            RC.CARRIER_NAME "value",
+            RC.CARRIER_NAME "carrierName"
         from RMS_CARRIER RC
         <where>
             <if test="index != null">
                 RC.CARRIER_NAME  like #{index}
+                and rownum &lt; 10
             </if>
             <if test="index == null">
                 rownum &lt; 10
             </if>
         </where>
         order by "value"
-        )
     </select>
 
     <select id="queryConsigneeByLike" resultType="java.util.Map" parameterType="java.util.Map" >