|
@@ -495,10 +495,11 @@ 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::getIsMaster, true)
|
|
.and(item -> item.eq(PgOrderWorker::getWorkerId, currentCompanyWechat.getUserId())
|
|
.and(item -> item.eq(PgOrderWorker::getWorkerId, currentCompanyWechat.getUserId())
|
|
.or(!StringUtil.isEmpty(currentCompanyWechat.getUser().getWorkerNumber()))
|
|
.or(!StringUtil.isEmpty(currentCompanyWechat.getUser().getWorkerNumber()))
|
|
.eq(!StringUtil.isEmpty(currentCompanyWechat.getUser().getWorkerNumber()),PgOrderWorker::getWorkerNumber,currentCompanyWechat.getUser().getWorkerNumber()))
|
|
.eq(!StringUtil.isEmpty(currentCompanyWechat.getUser().getWorkerNumber()),PgOrderWorker::getWorkerNumber,currentCompanyWechat.getUser().getWorkerNumber()))
|
|
-
|
|
|
|
|
|
+ .last("limit 1")
|
|
.one();
|
|
.one();
|
|
if (one == null) {
|
|
if (one == null) {
|
|
throw new RemoteServiceException("暂无权限接单");
|
|
throw new RemoteServiceException("暂无权限接单");
|