提交

src/main/java/com/steerinfo/dil/controller/OmstruckOrderSeparateController.java

@@ -166,7 +166,7 @@ public class OmstruckOrderSeparateController extends BaseRESTfulController {
                                            Integer pageSize,
                                            Integer type,
                                            Integer orderStatus,
-                                           Integer carrierId,
+                                           String carrierId,
                                            String  con) {
         int count = 0;
         if (orderStatus != null) {
@@ -177,7 +177,7 @@ public class OmstruckOrderSeparateController extends BaseRESTfulController {
             mapValue.put("type", type);
             count++;
         }
-        if (carrierId != null) {
+        if (carrierId != null && !"undefined".equals(carrierId)) {
             mapValue.put("carrierId", carrierId);
             count++;
         }

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

@@ -409,7 +409,8 @@
                 and OO.ORDER_TYPE = 14
             </if>
             <if test="carrierId != null">
-                and ASO.CARRIER_ID = #{carrierId}
+                and ASO.CARRIER_ID = (select rc.carrier_id from rms_carrier rc
+                where rc.carrier_sso_id= #{carrierId})
             </if>
         </where>
         )