Redeem 1 year ago
parent
commit
c4b6ffa238

+ 1 - 1
src/main/resources/application-prod.yml

@@ -26,7 +26,7 @@ openfeign:
   ColumnDataFeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.90.202:80}
     url: ${COLUMNDATAFEIGN_URL:172.16.90.202:80}
   AmsFeign:
   AmsFeign:
-    url: ${AMSFEIGN_URL:172.16.90.202:80}
+    url: ${AMSFEIGN_URL:172.16.90.202:8079}
   TmsFeign:
   TmsFeign:
     url: ${TMSFEIGN_URL:172.16.90.202:80}
     url: ${TMSFEIGN_URL:172.16.90.202:80}
   WMSFeign:
   WMSFeign:

+ 2 - 0
src/main/resources/com/steerinfo/dil/mapper/UniversalMapper.xml

@@ -162,8 +162,10 @@
             </if>
             </if>
             )
             )
             <where>
             <where>
+            <if test="companyType != null and companyType == '业务单位'">
                 <include refid="com.steerinfo.dil.mapper.CommonMapper.rootCompanyFilter"></include>
                 <include refid="com.steerinfo.dil.mapper.CommonMapper.rootCompanyFilter"></include>
                 <include refid="com.steerinfo.dil.mapper.CommonMapper.filterCompanyData"></include>
                 <include refid="com.steerinfo.dil.mapper.CommonMapper.filterCompanyData"></include>
+            </if>
             </where>
             </where>
             FETCH NEXT 10 ROWS ONLY
             FETCH NEXT 10 ROWS ONLY
         )
         )