open_platform/ss-common-storage
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

获取省、市、县接口迁移

Browse Source 
库区列表查询报错问题修改
This commit is contained in:
God
2024-06-28 18:00:28 +08:00
parent fdee937f3d
commit 25c2295ffc
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseArea.java
View File

@@ -21,4 +21,5 @@ public class WarehouseArea extends BaseEntity {
private String volume;//库位容量 private String volume;//库位容量
private String unit;//计量单位 private String unit;//计量单位
private String areaTypeSid;//货区类型 private String areaTypeSid;//货区类型
private String useOrgSid;
} }

2
src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseAreaDto.java
View File

@@ -24,5 +24,5 @@ public class WarehouseAreaDto implements Dto {
private String volume;//库位容量 private String volume;//库位容量
private String unit;//计量单位 private String unit;//计量单位
private String areaTypeSid;//货区类型 private String areaTypeSid;//货区类型
private String useOrgSid;
} }

8
src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseAreaService.java
View File

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