fix: Fix block update bug

Author: lu-yg

base/src/main/java/com/tinyengine/it/controller/BlockController.java

@@ -53,8 +53,10 @@
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 区块
@@ -255,13 +257,19 @@ public Result<List<String>> allTags() {
     @GetMapping("/block/notgroup/{groupId}")
     public Result<List<BlockDto>> findBlocksNotInGroup(@PathVariable Integer groupId,
         @RequestParam(value = "label_contains", required = false) String label,
+        @RequestParam(value = "name_cn_contains", required = false) String name,
         @RequestParam(value = "tags_contains", required = false) String[] tags,
         @RequestParam(value = "createdBy", required = false) String createdBy) {
         NotGroupDto notGroupDto = new NotGroupDto();
         notGroupDto.setGroupId(groupId);
         notGroupDto.setLabel(label);
+        notGroupDto.setName(name);
         notGroupDto.setCreatedBy(createdBy);
         notGroupDto.setTags(null);
+        if (tags != null && tags.length > 0) {
+            notGroupDto.setTags(JsonUtils.encode(tags)); // 将数组转换为有效的 JSON 字符串
+        }
+
 
         List<BlockDto> blocksList = blockService.getNotInGroupBlocks(notGroupDto);
         return Result.success(blocksList);

base/src/main/java/com/tinyengine/it/mapper/BlockMapper.java

@@ -156,11 +156,13 @@ public interface BlockMapper extends BaseMapper<Block> {
     })
     @Select("<script>" + "SELECT b.* " + "FROM t_block b " + "<where>"
             + "  <if test='notGroupDto.label != null and notGroupDto.label != \"\"'> "
-            + "    AND b.label LIKE CONCAT('%', #{notGroupDto.label}, '%') " + "  </if>"
+            + "    OR b.label LIKE CONCAT('%', #{notGroupDto.label}, '%') " + "  </if>"
+            + "  <if test='notGroupDto.name != null and notGroupDto.name != \"\"'> "
+            + "    OR b.name LIKE CONCAT('%', #{notGroupDto.name}, '%') " + "  </if>"
             + "  <if test='notGroupDto.createdBy != null and notGroupDto.createdBy != \"\"'> "
-            + "    AND b.created_by LIKE CONCAT('%', #{notGroupDto.createdBy}, '%') " + "  </if>"
-            + "  <if test='notGroupDto.tags != null and notGroupDto.tags.length > 0'> "
-            + "    AND JSON_CONTAINS(b.tags, #{notGroupDto.tags})" + "  </if>" + "</where>" + "</script>")
+            + "    OR b.created_by LIKE CONCAT('%', #{notGroupDto.createdBy}, '%') " + "  </if>"
+            + "  <if test='notGroupDto.tags != null and notGroupDto.tags != \"\"'> "
+            + "    OR JSON_CONTAINS(b.tags, #{notGroupDto.tags})" + "  </if>" + "</where>" + "</script>")
     List<BlockDto> findBlocksReturn(@Param("notGroupDto") NotGroupDto notGroupDto);
 
     /**

base/src/main/java/com/tinyengine/it/model/dto/NotGroupDto.java

@@ -31,9 +31,13 @@ public class NotGroupDto {
     @Schema(name = "label", description = "区块编码")
     private String label;
 
+    @Schema(name = "name", description = "区块名称")
+    private String name;
+
+
     @Schema(name = "createdBY", description = "创建人id")
     private String createdBy;
 
     @Schema(name = "tags", description = "区块标签")
-    private String [] tags;
+    private String tags;
 }