From bfc1c1abd1d1deab45740806ce984b6774a319bd Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 05 二月 2024 11:01:13 +0800
Subject: [PATCH] 修改目录编码过滤功能
---
src/main/java/com/lf/server/service/show/DataLibService.java | 21 ++++++++++++++-------
src/main/resources/mapper/all/BaseQueryMapper.xml | 25 +++++++++++++------------
src/main/java/com/lf/server/controller/show/DataLibController.java | 1 -
3 files changed, 27 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/lf/server/controller/show/DataLibController.java b/src/main/java/com/lf/server/controller/show/DataLibController.java
index 4e7ee50..e15d9c8 100644
--- a/src/main/java/com/lf/server/controller/show/DataLibController.java
+++ b/src/main/java/com/lf/server/controller/show/DataLibController.java
@@ -101,7 +101,6 @@
// dirs = DataLibService.copeCodes(dirs, "dircode")
dirs = dataLibService.getDirsByTypes(types, dirs, "dircode");
-
int count = metaService.selectMetasForCount(depcode, dirs, name);
if (count == 0) {
return success(0, null);
diff --git a/src/main/java/com/lf/server/service/show/DataLibService.java b/src/main/java/com/lf/server/service/show/DataLibService.java
index e6f839b..7815f85 100644
--- a/src/main/java/com/lf/server/service/show/DataLibService.java
+++ b/src/main/java/com/lf/server/service/show/DataLibService.java
@@ -287,12 +287,19 @@
return null;
}
- List<String> list = Arrays.asList(codes.split(","));
+ //List<String> list = Arrays.asList(codes.split(","));
//List<String> list = codesAsList(codes);
//list = copeDirCodes(list);
- setRightLike(list, field);
+ //setRightLike(list, field);
- return "(" + StringHelper.join(list, " or ") + ")";
+ //return "(" + StringHelper.join(list, " or ") + ")";
+
+ List<String> list = new ArrayList<>();
+ for (String dir : codes.split(",")) {
+ list.add("^" + dir);
+ }
+
+ return field + " ~ '" + StringHelper.join(list, "|") + "'";
}
/**
@@ -370,13 +377,13 @@
}
/**
- * 璁剧疆 鍙砽ike
+ * 璁剧疆 鍙砽ike *
*/
private static void setRightLike(List<String> list, String field) {
- /*if (list.isEmpty()) {
+ if (list.isEmpty()) {
list.add("1 = 2");
return;
- }*/
+ }
for (int i = 0, c = list.size(); i < c; i++) {
String str = String.format("%s like '%s%%'", field, list.get(i));
@@ -393,7 +400,7 @@
}
if (!StringUtils.isEmpty(types)) {
- List<KeyValueEntity> list = baseQueryService.selectDirsByTypes(types.split(","), dirs);
+ List<KeyValueEntity> list = baseQueryService.selectDirsByTypes(types.split(","), copeCodes(dirs, "code"));
if (null == list || list.isEmpty()) {
return null;
}
diff --git a/src/main/resources/mapper/all/BaseQueryMapper.xml b/src/main/resources/mapper/all/BaseQueryMapper.xml
index c1b9ef0..2e85d14 100644
--- a/src/main/resources/mapper/all/BaseQueryMapper.xml
+++ b/src/main/resources/mapper/all/BaseQueryMapper.xml
@@ -87,22 +87,23 @@
</select>
<select id="selectDirsByTypes" resultType="com.lf.server.entity.ctrl.KeyValueEntity">
- select name "key", (select string_agg(code, ',') from lf.sys_dir where name = a.name) "value"
- from lf.sys_dir a
- <where>
- 1 = 1
- <if test="types != null">
- and name in
+ with rs as (
+ select name, code
+ from lf.sys_dir
+ <where>
+ name in
<foreach item="type" collection="types" open="(" separator="," close=")">
#{type}
</foreach>
- </if>
- <if test="dirs != null">
- and ${dirs}
- </if>
- </where>
+ <if test="dirs != null">
+ and ${dirs}
+ </if>
+ </where>
+ )
+ select name "key", (select string_agg(code, ',') from rs where name = a.name) "value"
+ from rs a
group by name
- order by key
+ order by value;
</select>
<select id="selectAnnexByTab" resultType="com.lf.server.entity.sys.AttachEntity">
--
Gitblit v1.9.3