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

src/main/resources/application-prod.yml

@@ -26,9 +26,9 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.90.202:80}
   AmsFeign:
-    url: ${AMSFEIGN_URL:172.16.90.202:8000}
+    url: ${AMSFEIGN_URL:localhost:8079}
   TmsFeign:
-    url: ${TMSFEIGN_URL:172.16.90.202:8000}
+    url: ${TMSFEIGN_URL:localhost:8095}
   WMSFeign:
     url: ${WMSFEIGN_URL:172.16.90.202:8000}
   RmsFeign:

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

@@ -42,7 +42,9 @@
     </sql>
     <sql id="rootCompanyFilter">
         <if test="rootCompanyMap != null and urlFlag != null and urlFlag != 'null' and urlFlag != ''">
-            AND "rootCompanyId" = #{rootCompanyMap.rootCompanyId}
+            AND ("rootCompanyId" = #{rootCompanyMap.rootCompanyId}
+            OR  #{urlFlag} = (SELECT IS_LISTED FROM RMS_COMPANY WHERE COMPANY_ID = "rootCompanyId")
+            )
         </if>
     </sql>
     <sql id="filterCompanyData">