提交 900b2f1f 作者: zhangqiliang

取消根据账号查询仓库,改为根据服务商查询仓库

父级 2db1cc05
......@@ -255,14 +255,6 @@ public class WarehouseService {
}
public List<WarehouseDTO> qryWarehouseList(WarehouseQuery warehouseQuery) {
if (StringUtils.isEmpty(warehouseQuery.getCreateAccount())) {
SessionInfo sessionInfo = ProcessUtil.getUserInfo();
if (sessionInfo != null) {
if (!"1".equals(sessionInfo.getUserId())){
warehouseQuery.setCreateAccount(sessionInfo.getUserId());
}
}
}
warehouseQuery.setAppkey(appkey);
logger.info("qryWarehouseList请求数据:{}", JSONUtilsEx.serialize(warehouseQuery));
System.out.println("分页"+warehouseQuery.getPage());
......@@ -778,15 +770,6 @@ public class WarehouseService {
WarehouseQuery warehouseQuery = new WarehouseQuery();
warehouseQuery.setAppkey(appkey);
warehouseQuery.setWarehouseLevenId(id.toString());
if (StringUtils.isEmpty(warehouseQuery.getCreateAccount())) {
SessionInfo sessionInfo = ProcessUtil.getUserInfo();
if (sessionInfo != null) {
if (!"1".equals(sessionInfo.getUserId())){
warehouseQuery.setCreateAccount(sessionInfo.getUserId());
}
}
}
List<String> serviceProviders = new ArrayList<>(1);
if (org.apache.commons.lang3.StringUtils.isNotBlank(warehouseQuery.getServiceProvider())) {
serviceProviders = Arrays.asList(warehouseQuery.getServiceProvider().split(CamsConstant.COMMA));
......@@ -828,14 +811,6 @@ public class WarehouseService {
if (!StringUtils.isEmpty(installSupplierId)) {
warehouseQuery.setServiceProvider(installSupplierId);
}
if (StringUtils.isEmpty(warehouseQuery.getCreateAccount())) {
SessionInfo sessionInfo = ProcessUtil.getUserInfo();
if (sessionInfo != null) {
if (!"1".equals(sessionInfo.getUserId())){
warehouseQuery.setCreateAccount(sessionInfo.getUserId());
}
}
}
PageLimitHolderFilter.setContext(warehouseQuery.getPage(), warehouseQuery.getPagecount(), 0);
List<String> serviceProviders = new ArrayList<>(1);
if (org.apache.commons.lang3.StringUtils.isNotBlank(warehouseQuery.getServiceProvider())) {
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论