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 类型属性
*
- * 例如:@Query(blurry = "username,email") 表示根据用户名和邮箱模糊查询
+ * 例如:@Query(blurry = {"username", "email"}) 表示根据用户名和邮箱模糊查询
*
*/
- 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 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;
/**