Merge branch 'dev-yhq' into develop

src/main/java/com/backendsys/modules/material/service/impl/MaterialServiceImpl.java

@@ -109,6 +109,14 @@ public class MaterialServiceImpl implements MaterialService {
 
         ObjectKeyEntity objectKeyEntity = objectKeyUtil.urlToObjectKey(material.getImage_url());
 
+        // [Filter] tag_id 过滤掉空值和 0
+        String cleaned = Optional.ofNullable(material.getTag_ids())
+            .orElse("")
+            .replaceAll("\\b0\\b,?", "")
+            .replaceAll(",{2,}", ",")
+            .replaceAll("^,|,$", "");
+        material.setTag_ids(cleaned);
+
 //        // 错误做法：原图地址不能加参数，否则缩略图会重复加参数
 //        if (StrUtil.isNotEmpty(material.getImage_url())) {
 //            String image_url = UploadUtil.getImageThumbUrl(material.getImage_url(), objectKeyEntity.getTarget(), 315, null, null, true);
@@ -143,10 +151,10 @@ public class MaterialServiceImpl implements MaterialService {
 
         // [Filter] tag_id 过滤掉空值和 0
         String cleaned = Optional.ofNullable(material.getTag_ids())
-                .orElse("")
-                .replaceAll("\\b0\\b,?", "")
-                .replaceAll(",{2,}", ",")
-                .replaceAll("^,|,$", "");
+            .orElse("")
+            .replaceAll("\\b0\\b,?", "")
+            .replaceAll(",{2,}", ",")
+            .replaceAll("^,|,$", "");
         material.setTag_ids(cleaned);
 
         // 编辑的时候，如果素材图片有修改，需要删除之前的图片