属性管理

platform-admin/src/main/java/com/platform/controller/AttributesController.java

@@ -288,38 +288,41 @@ public class AttributesController {
 //            paramList.add(param);
 //        });
         List<TbCfItemParamEntity> paramList = itemParamService.queryParamByItemId(itemId);
-        List<TbCfItemParamEntity> collect = paramList.stream().filter(p -> p.getAttrId() != null).collect(Collectors.toList());
+        List<TbCfItemParamEntity> collect = paramList.stream()
+                .filter(p -> StringUtils.isNotBlank(p.getAttrId()))
+                .filter(p -> StringUtils.isNotBlank(p.getAttrDescId()))
+                .collect(Collectors.toList());
+
         collect.forEach(param -> {
             AttributesEntity attr = attributesService.queryObject(param.getAttrId());
             if (attr != null) {
                 param.setAttrId(attr.getId());
                 param.setParamName(attr.getAttrName());
-                if (!StringUtils.isBlank(param.getAttrDescId())) {
-                    String[] arr = param.getAttrDescId().split(",");
-                    List<AttributesDescEntity> descEntities = attributesDescService.queryDescByIds(arr);
-                    List<AttributesDescVo> list = new ArrayList<>();
-                    param.setAttrDescId(param.getAttrDescId());
-                    descEntities.forEach(desc -> {
-                        AttributesDescVo attVo = new AttributesDescVo();
-                        String value = desc.getAttrValue();
-                        attVo.setAttrDescId(desc.getAttrDescId());
-                        if (!StringUtils.isBlank(desc.getAttrDesc())) {
-                            value = value + "(" + desc.getAttrDesc() + ")";
-                        }
-                        attVo.setAttrValue(value);
-                        list.add(attVo);
-                    });
-                    param.setList(list);
-                }
-            }
+                String[] arr = param.getAttrDescId().split(",");
+                List<AttributesDescEntity> descEntities = attributesDescService.queryDescByIds(arr);
+
+                List<AttributesDescVo> list = new ArrayList<>();
+                param.setAttrDescId(param.getAttrDescId());
+                descEntities.forEach(desc -> {
+                    AttributesDescVo attVo = new AttributesDescVo();
+                    String value = desc.getAttrValue();
+                    attVo.setAttrDescId(desc.getAttrDescId());
+                    if (StringUtils.isNotBlank(desc.getAttrDesc())) {
+                        value = value + "(" + desc.getAttrDesc() + ")";
+                    }
+                    attVo.setAttrValue(value);
+                    list.add(attVo);
+                });
+                param.setList(list);
 
+            }
 
         });
 
-        collect.forEach(p -> {
-            p.setParamName(null);
-            p.setParamValue(null);
-        });
+//        collect.forEach(p -> {
+//            p.setParamName(null);
+//            p.setParamValue(null);
+//        });
 
         return R.ok().put("list", collect);
     }