提交 7826f795 authored 作者: 吴德鹏's avatar 吴德鹏

属性管理

上级 d36958f5
...@@ -152,10 +152,10 @@ public class AttributesController { ...@@ -152,10 +152,10 @@ public class AttributesController {
public R queryAttrNames() { public R queryAttrNames() {
LinkedList<AttributesVo> attrNameList = new LinkedList<>(); LinkedList<AttributesVo> attrNameList = new LinkedList<>();
List<AttributesEntity> list = attributesService.queryList(null); List<AttributesEntity> list = attributesService.queryList(null);
list.forEach(attr -> { // list.forEach(attr -> {
AttributesVo attrNames = new AttributesVo(); // AttributesVo attrNames = new AttributesVo();
attrNames.setId(attr.getId()); // attrNames.setId(attr.getId());
attrNames.setAttrName(attr.getAttrName()); // attrNames.setAttrName(attr.getAttrName());
// List<AttributesDescEntity> descs = attributesDescService.queryByAttrId(attr.getId()); // List<AttributesDescEntity> descs = attributesDescService.queryByAttrId(attr.getId());
// //
// List<AttributesDescVo> attributesVos = new ArrayList<>(); // List<AttributesDescVo> attributesVos = new ArrayList<>();
...@@ -169,10 +169,11 @@ public class AttributesController { ...@@ -169,10 +169,11 @@ public class AttributesController {
// }); // });
// //
// attrNames.setDescList(attributesVos); // attrNames.setDescList(attributesVos);
attrNameList.add(attrNames); // attrNameList.add(attrNames);
}); // });
return R.ok().put("list", attrNameList); List<AttributesEntity> collect = list.stream().filter(a -> a.getStatus() == 1).collect(Collectors.toList());
return R.ok().put("list", collect);
} }
/** /**
...@@ -295,7 +296,7 @@ public class AttributesController { ...@@ -295,7 +296,7 @@ public class AttributesController {
collect.forEach(param -> { collect.forEach(param -> {
AttributesEntity attr = attributesService.queryObject(param.getAttrId()); AttributesEntity attr = attributesService.queryObject(param.getAttrId());
if (attr != null) { if (attr != null && "1".equals(attr.getStatus().toString())) {
param.setAttrId(attr.getId()); param.setAttrId(attr.getId());
String[] arr = param.getAttrDescId().split(","); String[] arr = param.getAttrDescId().split(",");
......
...@@ -48,6 +48,7 @@ ...@@ -48,6 +48,7 @@
`attr_name`, `attr_name`,
`status`, `status`,
`sort`, `sort`,
`is_need`,
`create_time`, `create_time`,
`update_time` `update_time`
from attributes from attributes
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论