|
|
@ -53,10 +53,10 @@ public class WarehouseAreaService extends MybatisBaseService<WarehouseAreaMapper |
|
|
|
qw.like("orgSidPath", orgSidPath); |
|
|
|
} else if ("5".equals(orgLevelKey)) { |
|
|
|
qw.eq("createBySid", query.getUserSid()); |
|
|
|
} else { |
|
|
|
} /*else { |
|
|
|
PagerVo<WarehouseAreaVo> p = new PagerVo<>(); |
|
|
|
return rb.success().setData(p); |
|
|
|
} |
|
|
|
}*/ |
|
|
|
} |
|
|
|
// else {
|
|
|
|
// PagerVo<WarehouseAreaVo> p = new PagerVo<>();
|
|
|
@ -75,9 +75,9 @@ public class WarehouseAreaService extends MybatisBaseService<WarehouseAreaMapper |
|
|
|
qw.eq("sid", query.getAreaTypeSid()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getOrgPath())) { |
|
|
|
qw.like("useOrgSid", query.getOrgPath()); |
|
|
|
qw.like("a.useOrgSid", query.getOrgPath()); |
|
|
|
} |
|
|
|
qw.ne("isDelete", "1"); |
|
|
|
qw.ne("a.isDelete", "1"); |
|
|
|
IPage<WarehouseArea> page = PagerUtil.queryToPage(pq); |
|
|
|
IPage<WarehouseAreaVo> pagging = baseMapper.listPage(page, qw); |
|
|
|
PagerVo<WarehouseAreaVo> p = PagerUtil.pageToVo(pagging, null); |
|
|
|