Skip to content

C
cloud-platform
Commit 0f34baea authored by jiaorz's avatar jiaorz
Browse files
Options

Merge branch 'master-bg-update' into base-modify

parents 22221e77 3de2eaf0
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 0 deletions
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/BackgroundBaseOrderBiz.java
View file @ 0f34baea
...@@ -59,6 +59,10 @@ public class BackgroundBaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> ...@@ -59,6 +59,10 @@ public class BackgroundBaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder>
companyIds.add(dto.getStartCompanyId()); companyIds.add(dto.getStartCompanyId());
} }
} }
//有当前大区权限才能搜索到数据
if (dto.getZoneId() != null && (userDTO.getDataAll() == 1 || userDTO.getZoneId().equals(dto.getZoneId()) || userDTO.getDataZone().contains(dto.getZoneId()+""))) {
companyIds.clear();
}
dto.setCompanyIds(companyIds); dto.setCompanyIds(companyIds);
if (dto.getStartTime() != null) { if (dto.getStartTime() != null) {
if (dto.getEndTime() == null) { if (dto.getEndTime() == null) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment