|
|
@@ -495,7 +495,6 @@ public class OrderBaseLogic {
|
|
|
CurrentCompanyWechat currentCompanyWechat = commonLogic.getCurrentCompanyWechat();
|
|
|
PgOrderWorker one = pgOrderWorkerService.lambdaQuery()
|
|
|
.eq(PgOrderWorker::getOrderBaseId, orderBaseId)
|
|
|
- .eq(PgOrderWorker::getIsMaster, true)
|
|
|
.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()))
|
