‘linchangsheng’ 7 ماه پیش
والد
کامیت
cc11c879d9
1فایلهای تغییر یافته به همراه4 افزوده شده و 1 حذف شده
  1. 4 1
      mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/workorder/OrderBaseLogic.java

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

@@ -443,7 +443,10 @@ public class OrderBaseLogic {
         CurrentCompanyWechat currentCompanyWechat = commonLogic.getCurrentCompanyWechat();
         PgOrderWorker one = pgOrderWorkerService.lambdaQuery()
                 .eq(PgOrderWorker::getOrderBaseId, orderBaseId)
-                .eq(PgOrderWorker::getWorkerId, currentCompanyWechat.getUserId())
+                .and(item -> item.eq(PgOrderWorker::getWorkerId, currentCompanyWechat.getUserId())
+                .or(!StringUtil.isEmpty(currentCompanyWechat.getUser().getWorkerNumber()))
+                        .eq(!StringUtil.isEmpty(currentCompanyWechat.getUser().getWorkerNumber()),PgOrderWorker::getWorkerNumber,currentCompanyWechat.getUser().getWorkerNumber()))
+
                 .one();
         if (one == null) {
             throw new RemoteServiceException("暂无权限接单");