From 1aab88859d4852fde22ca66eb30072e17dd93dde Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 11 三月 2022 19:02:46 +0800
Subject: [PATCH] update 重命名 oracle postgres sqlserver 菜单字段 query -> query_param

---
 ruoyi-common/src/main/java/com/ruoyi/common/helper/DataBaseHelper.java |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 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";
     }
 }

--
Gitblit v1.9.3