From ed8c7a5effd0d423ce1118b680ecdca6fe732609 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 02 七月 2025 16:43:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.11.205:9000/r/P2022036_Service
---
src/main/java/com/lf/server/service/show/DataLibService.java | 29 ++++++++++++++++++-----------
1 files changed, 18 insertions(+), 11 deletions(-)
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 88f9bf4..5abe6ac 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,9 +400,9 @@
}
if (!StringUtils.isEmpty(types)) {
- List<KeyValueEntity> list = baseQueryService.selectDirsByTypes(types, dirs);
+ List<KeyValueEntity> list = baseQueryService.selectDirsByTypes(types.split(","), copeCodes(dirs, "code"));
if (null == list || list.isEmpty()) {
- return null;
+ return "1 = 2";
}
return copeDirs(list, field);
@@ -405,17 +412,17 @@
}
/**
- * 澶勭悊鐩綍缂栫爜
+ * 澶勭悊鐩綍缂栫爜锛歞ircode ~ '^0A|^0E'
*/
public static String copeDirs(List<KeyValueEntity> kvs, String field) {
List<String> list = new ArrayList<>();
for (KeyValueEntity kv : kvs) {
String[] dirs = kv.getValue().split(",");
for (String dir : dirs) {
- list.add(String.format("%s like '%s%%'", field, dir));
+ list.add("^" + dir);
}
}
- return "(" + StringHelper.join(list, " or ") + ")";
+ return field + " ~ '" + StringHelper.join(list, "|") + "'";
}
}
--
Gitblit v1.9.3