From 3ab3d49055ca1db5ac952a74111ecaade6c7e56d Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 15 十二月 2021 13:23:16 +0800
Subject: [PATCH] update 清除警告
---
ruoyi-framework/src/main/java/com/ruoyi/framework/handler/PlusDataPermissionHandler.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/handler/PlusDataPermissionHandler.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/handler/PlusDataPermissionHandler.java
index 89897c3..527fa60 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/handler/PlusDataPermissionHandler.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/handler/PlusDataPermissionHandler.java
@@ -96,13 +96,14 @@
return "";
}
// 涓嶅寘鍚� key 鍙橀噺 鍒欎笉澶勭悊
- if (!StringUtils.contains(type.getSql(), "#" + dataColumn.key())) {
+ if (!StringUtils.contains(type.getSqlTemplate(), "#" + dataColumn.key())) {
+ sqlString.append(type.getElseSql());
continue;
}
// 鏇存柊鎴栧垹闄ら渶婊¤冻鎵�鏈夋潯浠�
sqlString.append(isSelect ? " OR " : " AND ");
// 瑙ｆ瀽sql妯℃澘骞跺～鍏�
- String sql = parser.parseExpression(type.getSql(), parserContext).getValue(context, String.class);
+ String sql = parser.parseExpression(type.getSqlTemplate(), parserContext).getValue(context, String.class);
sqlString.append(sql);
}
}
--
Gitblit v1.9.3