|
|
@@ -747,6 +747,7 @@ public class OrderController extends BladeController {
|
|
|
.eq(PjOrder::getTenantId, AuthUtil.getTenantId())
|
|
|
.ge(ObjectUtils.isNotNull(statusDate), PjOrder::getBusinesDate, statusDate)
|
|
|
.le(ObjectUtils.isNotNull(endDate), PjOrder::getBusinesDate, endDate)
|
|
|
+ .eq( PjOrder::getStatus, "已发货")
|
|
|
.eq(PjOrder::getBsType, "XS");
|
|
|
if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("老板")) {
|
|
|
if (AuthUtil.getUserRole().contains("业务员")) {
|