From 3210fce113223dbcbc397dd0d892540fd591a222 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 11 三月 2022 18:55:04 +0800
Subject: [PATCH] update 删除 自定义 find_in_set 函数 在代码层面适配
---
script/sql/postgres/postgres_ry_vue_4.X.sql | 14 --------------
ruoyi-common/src/main/java/com/ruoyi/common/helper/DataBaseHelper.java | 13 +++++++++++--
script/sql/oracle/oracle_ry_vue_4.X.sql | 16 ----------------
3 files changed, 11 insertions(+), 32 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/helper/DataBaseHelper.java b/ruoyi-common/src/main/java/com/ruoyi/common/helper/DataBaseHelper.java
index 3d98def..55a3a41 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/helper/DataBaseHelper.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/helper/DataBaseHelper.java
@@ -53,9 +53,18 @@
public static String findInSet(Object var1, String var2) {
DataBaseType dataBasyType = getDataBasyType();
+ String var = Convert.toStr(var1);
if (dataBasyType == DataBaseType.SQL_SERVER) {
- return "charindex(" + Convert.toStr(var1) + ", " + var2 + ") <> 0";
+ // charindex(',100,' , ',0,100,101,') <> 0
+ return "charindex('," + var + ",' , ','+" + var2 + "+',') <> 0";
+ } else if (dataBasyType == DataBaseType.POSTGRE_SQL) {
+ // (select position(',100,' in ',0,100,101,')) <> 0
+ return "(select position('," + var + ",' in ','||" + var2 + "||',')) <> 0";
+ } else if (dataBasyType == DataBaseType.ORACLE) {
+ // instr(',0,100,101,' , ',100,') <> 0
+ return "instr(','||" + var2 + "||',' , '," + var + ",') <> 0";
}
- return "find_in_set(" + Convert.toStr(var1) + ", " + var2 + ") <> 0";
+ // find_in_set(100 , '0,100,101')
+ return "find_in_set(" + var + " , " + var2 + ") <> 0";
}
}
diff --git a/script/sql/oracle/oracle_ry_vue_4.X.sql b/script/sql/oracle/oracle_ry_vue_4.X.sql
index 6295231..9b77d58 100644
--- a/script/sql/oracle/oracle_ry_vue_4.X.sql
+++ b/script/sql/oracle/oracle_ry_vue_4.X.sql
@@ -940,22 +940,6 @@
insert into sys_oss_config values (3, 'aliyun', 'XXXXXXXXXXXXXXX', 'XXXXXXXXXXXXXXX', 'ruoyi', '', 'http://oss-cn-beijing.aliyuncs.com', 'N', '', '1', '', NULL, 'admin', sysdate, 'admin', sysdate);
insert into sys_oss_config values (4, 'qcloud', 'XXXXXXXXXXXXXXX', 'XXXXXXXXXXXXXXX', 'ruoyi-1250000000', '', 'http://cos.ap-beijing.myqcloud.com', 'N', 'ap-beijing', '1', '', NULL, 'admin', sysdate, 'admin', sysdate);
-
--- ----------------------------
--- 鍑芥暟 锛屼唬鏇縨ysql鐨刦ind_in_set
--- 渚嬪锛� select * from sys_dept where FIND_IN_SET (101,ancestors) <> 0
--- mysql鍙帴鍙�0鎴栧叾瀹僴umber鍋氫负where 鏉′欢锛宱racle鍙帴鍙楄〃杈惧紡鍋氫负where 鏉′欢
--- ----------------------------
-create or replace function find_in_set(arg1 in varchar2,arg2 in varchar)
-return number is Result number;
-begin
-select instr(','||arg2||',' , ','||arg1||',') into Result from dual;
-return(Result);
-end find_in_set;
-
--- 鍑芥暟鍒嗛殧绗�
-/
-
-- ----------------------------
-- 閽╁瓙 锛岀敤浜巗ession杩炴帴涔嬪悗 鑷姩璁剧疆榛樿鐨刣ate绫诲瀷鏍煎紡鍖� 绠�鍖栨椂闂存煡璇�
-- 濡傞渶璁剧疆鍏跺畠閰嶇疆 鍙湪姝ら挬瀛愬唴浠绘剰澧炲姞澶勭悊璇彞
diff --git a/script/sql/postgres/postgres_ry_vue_4.X.sql b/script/sql/postgres/postgres_ry_vue_4.X.sql
index b93309d..8cf02c2 100644
--- a/script/sql/postgres/postgres_ry_vue_4.X.sql
+++ b/script/sql/postgres/postgres_ry_vue_4.X.sql
@@ -951,17 +951,3 @@
insert into sys_oss_config values (2, 'qiniu', 'XXXXXXXXXXXXXXX', 'XXXXXXXXXXXXXXX', 'ruoyi', '', 'http://XXX.XXXX.com', 'N', 'z0', '1', '', 'admin', now(), 'admin', now(), null);
insert into sys_oss_config values (3, 'aliyun', 'XXXXXXXXXXXXXXX', 'XXXXXXXXXXXXXXX', 'ruoyi', '', 'http://oss-cn-beijing.aliyuncs.com', 'N', '', '1', '', 'admin', now(), 'admin', now(), null);
insert into sys_oss_config values (4, 'qcloud', 'XXXXXXXXXXXXXXX', 'XXXXXXXXXXXXXXX', 'ruoyi-1250000000', '', 'http://cos.ap-beijing.myqcloud.com', 'N', 'ap-beijing', '1', '', 'admin', now(), 'admin', now(), null);
-
--- ----------------------------
--- 鍑芥暟 锛屼唬鏇縨ysql鐨刦ind_in_set
--- 渚嬪锛� select * from sys_dept where FIND_IN_SET (101,ancestors) <> 0
--- ----------------------------
-create or replace function find_in_set(arg1 int8, arg2 varchar)
-returns int8 as $body$
-declare pos int8;
-begin
-select position(','||arg1||',' IN ','||arg2||',') into pos;
-return pos;
-end;
-$body$
-language plpgsql
--
Gitblit v1.9.3