|
|
@ -57,10 +57,10 @@ public class WarehouseRackService extends MybatisBaseService<WarehouseRackMapper |
|
|
|
PagerVo<WarehouseRackVo> p = new PagerVo<>(); |
|
|
|
return rb.success().setData(p); |
|
|
|
} |
|
|
|
} else { |
|
|
|
}/* else { |
|
|
|
PagerVo<WarehouseRackVo> p = new PagerVo<>(); |
|
|
|
return rb.success().setData(p); |
|
|
|
} |
|
|
|
}*/ |
|
|
|
if (StringUtils.isNotBlank(query.getName())) { |
|
|
|
qw.like("rackName", query.getName()); |
|
|
|
} |
|
|
@ -73,7 +73,7 @@ public class WarehouseRackService extends MybatisBaseService<WarehouseRackMapper |
|
|
|
if (StringUtils.isNotBlank(query.getWarehouseSid())) { |
|
|
|
qw.eq("sid", query.getWarehouseSid()); |
|
|
|
} |
|
|
|
qw.ne("isDelete", "1"); |
|
|
|
qw.ne("a.isDelete", "1"); |
|
|
|
if (StringUtils.isNotBlank(query.getOrgPath())) { |
|
|
|
qw.like("useOrgSid", query.getOrgPath()); |
|
|
|
} |
|
|
|