|
@@ -443,7 +443,10 @@ public class OrderBaseLogic {
|
|
CurrentCompanyWechat currentCompanyWechat = commonLogic.getCurrentCompanyWechat();
|
|
CurrentCompanyWechat currentCompanyWechat = commonLogic.getCurrentCompanyWechat();
|
|
PgOrderWorker one = pgOrderWorkerService.lambdaQuery()
|
|
PgOrderWorker one = pgOrderWorkerService.lambdaQuery()
|
|
.eq(PgOrderWorker::getOrderBaseId, orderBaseId)
|
|
.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();
|
|
.one();
|
|
if (one == null) {
|
|
if (one == null) {
|
|
throw new RemoteServiceException("暂无权限接单");
|
|
throw new RemoteServiceException("暂无权限接单");
|