修改

src/main/resources/application-prod.yml

@@ -25,11 +25,11 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.90.214:8083}
   AmsFeign:
-    url: ${AMSFEIGN_URL:localhost:8079}
+    url: ${AMSFEIGN_URL:172.16.90.214:8079}
   BmsFeign:
     url: ${BMSFEIGN_URL:172.16.90.214:8078}
   TmsFeign:
-    url: ${TMSFEIGN_URL:localhost:8086}
+    url: ${TMSFEIGN_URL:172.16.90.214:8086}
   WMSFeign:
     url: ${WMSFEIGN_URL:172.16.90.214:8093}
   OMSFeign:
@@ -41,7 +41,7 @@ openfeign:
   OTMSFeign:
     url: ${OTMSFEIGN_URL:172.16.90.214:8038}
   EmsFeign:
-    url: ${TMSFEIGN_URL:localhost:8096}
+    url: ${TMSFEIGN_URL:172.16.90.214:8096}
   SSOFeign:
     url: ${SSOFEIGN_URL:172.16.90.214:9001}
 

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

@@ -124,7 +124,10 @@
                 AND RC.COMPANY_TYPE = #{companyType}
             </if>
             <if test="companyId!=null and companyId!=''">
-                AND "companyId" = #{companyId}
+                AND RC.COMPANY_ID = #{companyId}
+            </if>
+            <if test="carrierId!=null and carrierId!=''">
+                AND RC.COMPANY_ID = #{carrierId}
             </if>
             <if test="index!=null and index!=''">
                 AND REGEXP_LIKE(RC.COMPANY_NAME, #{index})
@@ -299,7 +302,7 @@
         PERSONNEL_ID "value",
         PERSONNEL_NAME "label",
         PERSONNEL_NAME "text",
-        'personnelName' "prop",
+        'personnelName' "prop"
         from RMS_PERSONNEL
         where DELETED = 0
         )