Procházet zdrojové kódy

删除自定义权限规则关于sqlRule

ZhangWenQiang před 6 roky
rodič
revize
5233caf164

+ 1 - 14
happy-boot-base-common/src/main/java/org/jeecg/common/system/query/QueryGenerator.java

@@ -127,7 +127,7 @@ public class QueryGenerator {
         //权限规则自定义SQL表达式
         for (String c : ruleMap.keySet()) {
             if (oConvertUtils.isNotEmpty(c) && c.startsWith(SQL_RULES_COLUMN)) {
-                queryWrapper.and(i -> i.apply(getSqlRuleValueForRule(ruleMap.get(c).getRuleValue())));
+                queryWrapper.and(i -> i.apply(getSqlRuleValue(ruleMap.get(c).getRuleValue())));
             }
         }
 
@@ -585,19 +585,6 @@ public class QueryGenerator {
         return sqlRule;
     }
 
-    public static String getSqlRuleValueForRule(String sqlRule) {
-        try {
-            sqlRule = "a." + sqlRule;
-            Set<String> varParams = getSqlRuleParams(sqlRule);
-            for (String var : varParams) {
-                String tempValue = converRuleValue(var);
-                sqlRule = sqlRule.replace("#{" + var + "}", tempValue);
-            }
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-        }
-        return sqlRule;
-    }
 
     /**
      * 获取sql中的#{key} 这个key组成的set