1

src/main/resources/application-prod.yml

@@ -26,8 +26,8 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.90.202:80}
   AmsFeign:
-#    url: ${AMSFEIGN_URL:172.16.90.202:8000}
-    url: ${RMSFEIGN_URL:localhost:8079}
+    url: ${AMSFEIGN_URL:172.16.90.202:8000}
+#    url: ${AMSFEIGN_URL:localhost:8079}
   TmsFeign:
     url: ${TMSFEIGN_URL:172.16.90.202:8000}
 #    url: ${RMSFEIGN_URL:localhost:8086}

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

@@ -23,25 +23,35 @@
             <foreach collection="roleCodes" index="index" item="item" separator="or" close=")" open="(">
                 <choose>
                     <when test="item == 'chengYunShang'">
+                        (
                         "carrierId"
                         in
-                        <foreach collection="dilCompanyList" open="(" close=")" separator="," item="item" index="index">
-                            #{item.companyId}
+                        <foreach collection="dilCompanyList" open="(" close=")" separator=" UNION " item="item" index="index">
+                            SELECT
+                            COMPANY_ID
+                            FROM
+                            RMS_COMPANY WHERE COMPANY_NAME IN ( SELECT COMPANY_NAME FROM RMS_COMPANY WHERE COMPANY_ID =
+                            #{item.companyId})
                         </foreach>
-                    </when>
-                    <when test="item == 'shippingCompany'">
+                        OR
                         "shippingCompanyId"
                         in
-                        <foreach collection="dilCompanyList" open="(" close=")" separator="," item="item" index="index">
-                            #{item.companyId}
+                        <foreach collection="dilCompanyList" open="(" close=")" separator=" UNION " item="item" index="index">
+                            SELECT
+                            COMPANY_ID
+                            FROM
+                            RMS_COMPANY WHERE COMPANY_NAME IN ( SELECT COMPANY_NAME FROM RMS_COMPANY WHERE COMPANY_ID = #{item.companyId})
                         </foreach>
-                    </when>
-                    <when test="item == 'receivingCompany'">
+                        OR
                         "receivingCompanyId"
                         in
-                        <foreach collection="dilCompanyList" open="(" close=")" separator="," item="item" index="index">
-                            #{item.companyId}
+                        <foreach collection="dilCompanyList" open="(" close=")" separator=" UNION " item="item" index="index">
+                            SELECT
+                            COMPANY_ID
+                            FROM
+                            RMS_COMPANY WHERE COMPANY_NAME IN ( SELECT COMPANY_NAME FROM RMS_COMPANY WHERE COMPANY_ID = #{item.companyId})
                         </foreach>
+                        )
                     </when>
                     <when test="item == 'businessCompany'">
                         "businessCompanyId"