Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

for JimuReport/#3108 报表sql里面字符串包含:解析失败 #55

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

for JimuReport/#3108 报表sql里面字符串包含:解析失败 #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion docs/修改日志.log
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,4 +90,8 @@ minidao-spring-boot-starter/pom.xml
---author:chenrui---date:2024/10/22-----for:[TV360X-2759]springboot3使用分库数据源配置，启动提示Bean被提前实例化 #3001---
src/main/java/org/jeecgframework/minidao/factory/MiniDaoClassPathMapperScanner.java
src/main/java/org/jeecgframework/minidao/factory/MiniDaoBeanScannerConfigurer.java
---author:chenrui---date:2024/10/22-----for:[TV360X-2759]springboot3使用分库数据源配置，启动提示Bean被提前实例化 #3001---
---author:chenrui---date:2024/10/22-----for:[TV360X-2759]springboot3使用分库数据源配置，启动提示Bean被提前实例化 #3001---

---author:chenrui---date:2024/11/11-----for:[issues/3108]报表sql里面字符串包含有:报表无法加载，解析sql也失败 #3108---
src/main/java/org/jeecgframework/minidao/aop/MiniDaoHandler.java
---author:chenrui---date:2024/11/11-----for:[issues/3108]报表sql里面字符串包含有:报表无法加载，解析sql也失败 #3108---
10 changes: 9 additions & 1 deletion minidao-pe/src/main/java/org/jeecgframework/minidao/aop/MiniDaoHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -786,7 +786,15 @@ private Map<String, Object> installPlaceholderSqlParam(String executeSql, Map sq
logger.debug(" Match [" + m.group() + "] at positions " + m.start() + "-" + (m.end() - 1));
String ognl_key = m.group().replace(":", "").trim();
logger.debug(" --- minidao --- 解析参数 --- " + ognl_key);
map.put(ognl_key, Ognl.getValue(ognl_key, sqlParamsMap));
//update-begin---author:chenrui ---date:20241111 for：[issues/3108]报表sql里面字符串包含有:报表无法加载，解析sql也失败 #3108------------
Object value = null;
try {
value = Ognl.getValue(ognl_key, sqlParamsMap);
} catch (OgnlException e) {
logger.warn(e.getMessage());
}
map.put(ognl_key, value);
//update-end---author:chenrui ---date:20241111 for：[issues/3108]报表sql里面字符串包含有:报表无法加载，解析sql也失败 #3108------------
}
return map;
}
Expand Down