Commit 650929dd authored by 332784038@qq.com's avatar 332784038@qq.com

订单动态多参数查询bug修复

parent 531164a7
...@@ -686,7 +686,7 @@ public class OrderQueryVO { ...@@ -686,7 +686,7 @@ public class OrderQueryVO {
if (StringUtils.isNotBlank(statusString)) { if (StringUtils.isNotBlank(statusString)) {
this.asStatusList = Arrays.stream(statusString.split(StrUtil.COMMA)).map(Integer::parseInt).collect(Collectors.toList()); this.asStatusList = Arrays.stream(statusString.split(StrUtil.COMMA)).map(Integer::parseInt).collect(Collectors.toList());
if (CollectionUtil.isNotEmpty(this.asStatusList)) { if (CollectionUtil.isNotEmpty(this.asStatusList)) {
this.statusList = new ArrayList<>(); this.dynamicStatusList = new ArrayList<>();
for (Integer asStatus : asStatusList) { for (Integer asStatus : asStatusList) {
combinedStateList(asStatus, this.transportId); combinedStateList(asStatus, this.transportId);
} }
...@@ -697,7 +697,7 @@ public class OrderQueryVO { ...@@ -697,7 +697,7 @@ public class OrderQueryVO {
this.statusList = statusList; this.statusList = statusList;
this.asStatusList = statusList; this.asStatusList = statusList;
if (CollectionUtil.isNotEmpty(this.asStatusList)) { if (CollectionUtil.isNotEmpty(this.asStatusList)) {
this.statusList = new ArrayList<>(); this.dynamicStatusList = new ArrayList<>();
for (Integer asStatus : asStatusList) { for (Integer asStatus : asStatusList) {
combinedStateList(asStatus, this.transportId); combinedStateList(asStatus, this.transportId);
} }
...@@ -710,7 +710,7 @@ public class OrderQueryVO { ...@@ -710,7 +710,7 @@ public class OrderQueryVO {
combinedState(this.asStatus, this.transportId); combinedState(this.asStatus, this.transportId);
} }
if (Objects.nonNull(transportId) && CollectionUtil.isNotEmpty(this.asStatusList)) { if (Objects.nonNull(transportId) && CollectionUtil.isNotEmpty(this.asStatusList)) {
this.statusList = new ArrayList<>(); this.dynamicStatusList = new ArrayList<>();
for (Integer asStatus : asStatusList) { for (Integer asStatus : asStatusList) {
combinedStateList(asStatus, this.transportId); combinedStateList(asStatus, this.transportId);
} }
......
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