Commit 61b73321 by guojuxing

门店选择器:门店域test

parent c83204e6
...@@ -99,25 +99,25 @@ public class StoreController { ...@@ -99,25 +99,25 @@ public class StoreController {
List<StoreWidgetInterfaceShareVO> voList; List<StoreWidgetInterfaceShareVO> voList;
voList = result.stream().filter(e -> {
if (!authRegionSet.isEmpty()) { if (!authRegionSet.isEmpty()) {
voList = result.stream().filter(e -> authRegionSet.contains(e.getRegionId() + "")).map(e -> { if (authRegionSet.contains(e.getRegionId() + "")) {
StoreWidgetInterfaceShareVO vo = new StoreWidgetInterfaceShareVO(); return true;
vo.setLabel(e.getRegionName()).setValue(e.getRegionId().toString()); } else {
if (!Objects.equals(e.getFromEnterpriseId(), e.getEnterpriseId())) { return false;
vo.setEnterpriseName(enterpriseMap.get(e.getFromEnterpriseId()));
} }
return vo;
}).collect(Collectors.toList());
} else { } else {
voList = result.stream().map(e -> { return true;
}
}).map(e -> {
StoreWidgetInterfaceShareVO vo = new StoreWidgetInterfaceShareVO(); StoreWidgetInterfaceShareVO vo = new StoreWidgetInterfaceShareVO();
vo.setLabel(e.getRegionName()).setValue(e.getRegionId().toString()); vo.setLabel(e.getRegionName()).setValue(e.getRegionId().toString());
vo.setKey("com009");
if (!Objects.equals(e.getFromEnterpriseId(), e.getEnterpriseId())) { if (!Objects.equals(e.getFromEnterpriseId(), e.getEnterpriseId())) {
vo.setEnterpriseName(enterpriseMap.get(e.getFromEnterpriseId())); vo.setEnterpriseName(enterpriseMap.get(e.getFromEnterpriseId()));
} }
return vo; return vo;
}).collect(Collectors.toList()); }).collect(Collectors.toList());
}
return RestResponse.success(voList); return RestResponse.success(voList);
} else { } else {
......
...@@ -26,6 +26,8 @@ public class StoreWidgetInterfaceShareVO implements Serializable{ ...@@ -26,6 +26,8 @@ public class StoreWidgetInterfaceShareVO implements Serializable{
*/ */
private String enterpriseName; private String enterpriseName;
private String key;
public String getValue() { public String getValue() {
return value; return value;
} }
...@@ -53,12 +55,22 @@ public class StoreWidgetInterfaceShareVO implements Serializable{ ...@@ -53,12 +55,22 @@ public class StoreWidgetInterfaceShareVO implements Serializable{
return this; return this;
} }
public String getKey() {
return key;
}
public StoreWidgetInterfaceShareVO setKey(String key) {
this.key = key;
return this;
}
@Override @Override
public String toString() { public String toString() {
return "StoreWidgetInterfaceShareVO{" + return "StoreWidgetInterfaceShareVO{" +
"value='" + value + '\'' + "value='" + value + '\'' +
", label='" + label + '\'' + ", label='" + label + '\'' +
", enterpriseName='" + enterpriseName + '\'' + ", enterpriseName='" + enterpriseName + '\'' +
", key='" + key + '\'' +
'}'; '}';
} }
} }
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