需求

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/workorder/OrderBaseLogic.java

@@ -22,6 +22,7 @@ import com.gree.mall.miniapp.logic.common.outside.WorkOrderApiLogic;
 import com.gree.mall.miniapp.plus.entity.*;
 import com.gree.mall.miniapp.plus.service.*;
 import com.gree.mall.miniapp.utils.DateUtils;
+import com.gree.mall.miniapp.utils.StringUtil;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
@@ -103,7 +104,10 @@ public class OrderBaseLogic {
         mySchedule7Day.setDayList(dayList);
 
         List<String> orderBaseIds = pgOrderWorkerService.lambdaQuery()
-                .eq(PgOrderWorker::getWorkerId, currentCompanyWechat.getUserId())
+                .and(item -> item.eq(PgOrderWorker::getWorkerId, currentCompanyWechat.getUserId())
+                        .or(!StringUtil.isEmpty(currentCompanyWechat.getUser().getWorkerNumber()))
+                        .eq(PgOrderWorker::getWorkerNumber,currentCompanyWechat.getUser().getWorkerNumber())
+                )
                 .list().stream().map(PgOrderWorker::getOrderBaseId).distinct().collect(Collectors.toList());
         if(CollectionUtils.isEmpty(orderBaseIds)){
             return mySchedule7Day;
@@ -222,8 +226,9 @@ public class OrderBaseLogic {
                                 .like(PgOrderBase::getOrderSmallTypeText,keyword).or()
                                 .like(PgOrderBase::getUserMobile,keyword).or()
                                 .like(PgOrderBase::getAddress,keyword))
-                .and(item -> item.in(CollectionUtils.isNotEmpty(orderStatusList), PgOrderBase::getOrderStatus, orderStatusList)
-                .or(orderStatusList.contains("DJD")).or().eq(PgOrderBase::getIsMeet,false)
+                .and(CollectionUtils.isNotEmpty(orderStatusList),item -> item.in(CollectionUtils.isNotEmpty(orderStatusList), PgOrderBase::getOrderStatus, orderStatusList)
+                .or(CollectionUtils.isNotEmpty(orderStatusList) && orderStatusList.contains("DJD"))
+                                .eq(CollectionUtils.isNotEmpty(orderStatusList) && orderStatusList.contains("DJD"),PgOrderBase::getIsMeet,false)
                 )
                 .in(CollectionUtils.isEmpty(orderStatusList) || !orderStatusList.contains("DJD"),PgOrderBase::getIsMeet,true)
                 .eq(StringUtils.equals(orderStatus, OrderBaseStatusEnum.YCD.getKey()),PgOrderBase::getIsException,true)