Merge remote-tracking branch 'origin/master'

op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java

@@ -411,11 +411,13 @@ public class ProOrderServiceImpl implements IProOrderService {
 
         R<List<SapProOrder>> rSapProOrder = remoteSapService.shopOrderSync(sapqo);//sap只能同步指定日期的数据
 
-        List<SapProOrder> newOrders = rSapProOrder.getData();
-        if(CollectionUtils.isEmpty(newOrders)){
+        if(rSapProOrder == null){
             return AjaxResult.error("无"+sapqo.getCreateTime()+"之后的最新订单");
         }
 
+        List<SapProOrder> newOrders = rSapProOrder.getData();
+
+
         syncSAPFunc(newOrders);
 
         return success();

op-modules/op-plan/src/main/resources/mapper/plan/ProOrderMapper.xml

@@ -51,7 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="prodDesc != null  and prodDesc != ''"> and prod_desc like concat('%', #{prodDesc}, '%')</if>
 			<if test="quantity != null "> and quantity = #{quantity}</if>
 			<if test="unit != null  and unit != ''"> and unit = #{unit}</if>
-			<if test="workerOrder != null  and workerOrder != ''"> and worker_order = #{workerOrder}</if>
+			<if test="workerOrder != null  and workerOrder != ''"> and worker_order like concat('%', #{workerOrder}, '%')</if>
 			<if test="planProDate != null "> and plan_pro_date = #{planProDate}</if>
 			<if test="planComplete != null "> and plan_complete = #{planComplete}</if>
 			<if test="atrr1 != null  and atrr1 != ''"> and atrr1 = #{atrr1}</if>