Merge remote-tracking branch 'origin/master'

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

@@ -119,7 +119,8 @@ public class AttributesController {
             List<String> collect = descs.stream().map(AttributesDescEntity::getAttrDescId).collect(Collectors.toList());
             descIds.addAll(collect);
         }
-        attributesDescService.deleteBatch(descIds.toArray(new String[descIds.size()]));
+        if (descIds.size() > 0 && descIds != null)
+            attributesDescService.deleteBatch(descIds.toArray(new String[descIds.size()]));
         return R.ok();
     }
 
@@ -193,8 +194,8 @@ public class AttributesController {
             descVo.setAttrValue(attrValue + "(" + attrDesc + ")");
             attributesVos.add(descVo);
         });
-
-        return R.ok().put("list", attributesVos);
+        List<AttributesDescVo> list = attributesVos.stream().sorted(Comparator.comparing(AttributesDescVo::getAttrValue)).collect(Collectors.toList());
+        return R.ok().put("list", list);
     }
 
     /**