修改

src/main/resources/bootstrap.yml

@@ -1,7 +1,7 @@
 api.version: api/v1
 spring:
   profiles:
-    include: ${SPRING_PROFILES:dev}
+    include: ${SPRING_PROFILES:prod}
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8

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

@@ -83,7 +83,6 @@
         WHERE DL.VERSION_ID = 11
     </select>
 
-
     <!--  边输边查公司  -->
     <select id="getCompanyMesByLike" resultType="java.util.Map">
         select * from(
@@ -93,6 +92,7 @@
         RC.COMPANY_ID "id",
         RC.COMPANY_ID   "key",
         RC.COMPANY_ID "value",
+        RC.COMPANY_ID "carrierId",
         <if test="companyType==null">
             RC.COMPANY_TYPE || '-' ||
         </if>
@@ -150,38 +150,6 @@
             <if test="index!=null and index!=''">
                 AND REGEXP_LIKE(RC.COMPANY_NAME, #{index})
             </if>
-            <if test="roleCodes.contains('shippingCompany') and dilCompanyList != null and dilCompanyList.size > 0">
-                or RC.COMPANY_ID in
-                <foreach collection="dilCompanyList" item="item" open="(" close=")" separator=",">
-                    <if test="companyType == '发货单位'">
-                        #{item.companyId}
-                    </if>
-                </foreach>
-            </if>
-            <if test="roleCodes.contains('recevingCompany') and dilCompanyList != null and dilCompanyList.size > 0">
-                or RC.COMPANY_ID in
-                <foreach collection="dilCompanyList" item="item" open="(" close=")" separator=",">
-                    <if test="companyType == '收货单位'">
-                        #{item.companyId}
-                    </if>
-                </foreach>
-            </if>
-            <if test="roleCodes.contains('carrierCompany') and dilCompanyList != null and dilCompanyList.size > 0">
-                or RC.COMPANY_ID in
-                <foreach collection="dilCompanyList" item="item" open="(" close=")" separator=",">
-                    <if test="companyType == '承运单位'">
-                        #{item.companyId}
-                    </if>
-                </foreach>
-            </if>
-            <if test="roleCodes.contains('businessCompany') and dilCompanyList != null and dilCompanyList.size > 0">
-                or RC.COMPANY_ID in
-                <foreach collection="dilCompanyList" item="item" open="(" close=")" separator=",">
-                    <if test="companyType == '业务单位'">
-                        #{item.companyId}
-                    </if>
-                </foreach>
-            </if>
         </where>
         <if test="noRow == null">
             order by LENGTH(company_name)
@@ -196,6 +164,7 @@
             RC.COMPANY_ID "id",
             RC.COMPANY_ID   "key",
             RC.COMPANY_ID "value",
+            RC.COMPANY_ID "carrierId",
             <if test="companyType==null">
                 RC.COMPANY_TYPE || '-' ||
             </if>
@@ -560,6 +529,13 @@
             <if test="capacityTypeId!=null and capacityTypeId!=''">
                 AND RCT.CAPACITY_TYPE_ID =  #{capacityTypeId}
             </if>
+            <if test="capacityTypeNameList != null and capacityTypeNameList.size > 0">
+                and
+                RCT.CAPACITY_TYPE_NAME in
+                <foreach collection="capacityTypeNameList" index="index" item="item" separator="," close=")" open="(">
+                    #{item}
+                </foreach>
+            </if>
         </where>
         GROUP BY RCT .CAPACITY_TYPE_ID,RCT.CAPACITY_TYPE_NAME,RCT .CAPACITY_MAX_LOAD
         FETCH NEXT 10 ROWS ONLY
@@ -584,6 +560,13 @@
             <foreach collection="id" item="item"  open="(" close=")" separator="," >
                 #{item}
             </foreach>
+            <if test="capacityTypeNameList != null and capacityTypeNameList.size > 0">
+                and
+                RCT.CAPACITY_TYPE_NAME in
+                <foreach collection="capacityTypeNameList" index="index" item="item" separator="," close=")" open="(">
+                    #{item}
+                </foreach>
+            </if>
             GROUP BY RCT .CAPACITY_TYPE_ID,RCT.CAPACITY_TYPE_NAME,RCT .CAPACITY_MAX_LOAD
         </if>
     </select>