From 375810772aa8cb928fb1f6820e781cb43f869e03 Mon Sep 17 00:00:00 2001
From: Charles7c <charles7c@126.com>
Date: Tue, 12 Sep 2023 22:33:36 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96=E9=80=9A?=
 =?UTF-8?q?=E7=94=A8=E6=9F=A5=E8=AF=A2=E6=B3=A8=E8=A7=A3=E5=A4=9A=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E6=A8=A1=E7=B3=8A=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../top/charles7c/cnadmin/common/annotation/Query.java |  6 +++---
 .../cnadmin/common/util/helper/QueryHelper.java        | 10 +++++-----
 .../cnadmin/system/model/query/RoleQuery.java          |  2 +-
 .../cnadmin/system/model/query/UserQuery.java          |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/annotation/Query.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/annotation/Query.java
index 1a1e3623..fe2b583a 100644
--- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/annotation/Query.java
+++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/annotation/Query.java
@@ -43,10 +43,10 @@ public @interface Query {
     QueryTypeEnum type() default QueryTypeEnum.EQUAL;
 
     /**
-     * 多属性模糊查询，仅支持 String 类型属性，多个属性之间用逗号分隔
+     * 多属性模糊查询，仅支持 String 类型属性
      * <p>
-     * 例如：@Query(blurry = "username,email") 表示根据用户名和邮箱模糊查询
+     * 例如：@Query(blurry = {"username", "email"}) 表示根据用户名和邮箱模糊查询
      * </p>
      */
-    String blurry() default "";
+    String[] blurry() default {};
 }
diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/helper/QueryHelper.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/helper/QueryHelper.java
index 82441487..df4efed1 100644
--- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/helper/QueryHelper.java
+++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/helper/QueryHelper.java
@@ -26,6 +26,7 @@ import lombok.extern.slf4j.Slf4j;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 
+import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 
@@ -131,12 +132,11 @@ public class QueryHelper {
         QueryWrapper<R> queryWrapper) {
         // 解析多属性模糊查询
         // 如果设置了多属性模糊查询，分割属性进行条件拼接
-        String blurry = queryAnnotation.blurry();
-        if (StrUtil.isNotBlank(blurry)) {
-            String[] propertyArr = blurry.split(",");
+        String[] blurryPropertyArr = queryAnnotation.blurry();
+        if (ArrayUtil.isNotEmpty(blurryPropertyArr)) {
             queryWrapper.and(wrapper -> {
-                for (String property : propertyArr) {
-                    wrapper.or().like(StrUtil.toUnderlineCase(property), fieldValue);
+                for (String blurryProperty : blurryPropertyArr) {
+                    wrapper.or().like(StrUtil.toUnderlineCase(blurryProperty), fieldValue);
                 }
             });
             return;
diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/RoleQuery.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/RoleQuery.java
index 61e910f7..c32b0bdf 100644
--- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/RoleQuery.java
+++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/RoleQuery.java
@@ -40,7 +40,7 @@ public class RoleQuery implements Serializable {
      * 角色名称
      */
     @Schema(description = "角色名称", example = "测试人员")
-    @Query(blurry = "name,code")
+    @Query(blurry = {"name", "code"})
     private String name;
 
     /**
diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/UserQuery.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/UserQuery.java
index e36bf935..14cc59d6 100644
--- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/UserQuery.java
+++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/UserQuery.java
@@ -47,7 +47,7 @@ public class UserQuery implements Serializable {
      * 用户名
      */
     @Schema(description = "用户名", example = "zhangsan")
-    @Query(blurry = "username,nickname,email,phone")
+    @Query(blurry = {"username", "nickname", "email", "phone"})
     private String username;
 
     /**