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

src/main/resources/application-prod.yml

@@ -26,11 +26,11 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.90.214:8083}
   AmsFeign:
-    url: ${AMSFEIGN_URL:172.16.90.214:8079}
+    url: ${AMSFEIGN_URL:localhost:8079}
   BmsFeign:
     url: ${BMSFEIGN_URL:172.16.90.214:8078}
   TmsFeign:
-    url: ${TMSFEIGN_URL:172.16.90.214:8086}
+    url: ${TMSFEIGN_URL:localhost:8086}
   WMSFeign:
     url: ${WMSFEIGN_URL:172.16.90.214:8093}
   OMSFeign:

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

@@ -47,7 +47,7 @@
     </sql>
     <sql id="filterCompanyData">
         <if test="roleCodes != null and roleCodes.size > 0  and dilCompanyList != null and dilCompanyList.size > 0" >
-        AND
+            AND
             <foreach collection="roleCodes" index="index" item="item" separator="or" close=")" open="(">
                 <choose>
                     <when test="item == 'chengYunShang'">
@@ -78,8 +78,18 @@
                             #{item.companyId}
                         </foreach>
                     </when>
+                    <when test="item == 'approveBusinessCompany'">
+                        "approveBusinessCompanyId"
+                        in
+                        <foreach collection="dilCompanyList" open="(" close=")" separator="," item="item" index="index">
+                            #{item.companyId}
+                        </foreach>
+                    </when>
+                    <when test="item.contains('admin')">
+                        1 = 1
+                    </when>
                     <otherwise>
-                         1 = 1
+                        1 != 1
                     </otherwise>
                 </choose>
             </foreach>