|
@@ -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(),
|