Redeem 1 년 전
부모
커밋
0feb42c2d0
2개의 변경된 파일5개의 추가작업 그리고 3개의 파일을 삭제
  1. 2 2
      src/main/resources/application-prod.yml
  2. 3 1
      src/main/resources/com/steerinfo/dil/mapper/CommonMapper.xml

+ 2 - 2
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:

+ 3 - 1
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">