‘linchangsheng’ 4 months ago
parent
commit
bd7179abb2

+ 2 - 1
mall-server-api/src/main/java/com/gree/mall/manager/logic/policy/WorkerManagerLogic.java

@@ -137,7 +137,8 @@ public class WorkerManagerLogic {
 
 
         if (pgOrderBaseService.lambdaQuery()
-                .and(item -> item.eq(PgOrderBase::getWorkerNumber,websitUserBean.getWorkerNumber()).or().like(PgOrderBase::getWorkerIdList,websitUserBean.getUserId()))
+                .and(item -> item.eq(!StringUtil.isEmpty(websitUserBean.getWorkerNumber()),PgOrderBase::getWorkerNumber,websitUserBean.getWorkerNumber())
+                        .or(!StringUtil.isEmpty(websitUserBean.getWorkerNumber())).like(PgOrderBase::getWorkerIdList,websitUserBean.getUserId()))
                 .eq(PgOrderBase::getWebsitId,websitUserBean.getWebsitId())
                 .notIn(PgOrderBase::getOrderStatus, OrderBaseStatusEnum.YQX.getKey(),OrderBaseStatusEnum.YJS.getKey(),
                         OrderBaseStatusEnum.YWG.getKey(),OrderBaseStatusEnum.FWQX.getKey(),OrderBaseStatusEnum.YWGO.getKey(),