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

[jimu/issue/#2269]参数表达式新增中文支持 #31

Merged
merged 1 commit into from
Dec 26, 2023
Merged

[jimu/issue/#2269]参数表达式新增中文支持 #31

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 @@ -45,4 +45,8 @@ minidao-pe-spring-boot-starter\pom.xml

--author:wangshuai-----date:20231008----for:【QQYUN-6633】升级 1.6.2-GA2 后，下拉树组件多选后参数传递到 sql 中 in 语句失效 增加拼接函数/in函数--
src/main/java/org/jeecgframework/minidao/util/SimpleFormat.java
--author:wangshuai-----date:20231008----for:【QQYUN-6633】升级 1.6.2-GA2 后，下拉树组件多选后参数传递到 sql 中 in 语句失效 增加拼接函数/in函数--
--author:wangshuai-----date:20231008----for:【QQYUN-6633】升级 1.6.2-GA2 后，下拉树组件多选后参数传递到 sql 中 in 语句失效 增加拼接函数/in函数--

---author:chenrui---date:2023/12/26-----for:[jimu/issue/#2269]参数表达式新增中文支持---
minidao-pe/src/main/java/org/jeecgframework/minidao/aop/MiniDaoHandler.java
---author:chenrui---date:2023/12/26-----for:[jimu/issue/#2269]参数表达式新增中文支持---
4 changes: 3 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 @@ -776,7 +776,9 @@ private void initIdAnnotation(Field[] fields, Object obj) throws Exception {
private Map<String, Object> installPlaceholderSqlParam(String executeSql, Map sqlParamsMap) throws OgnlException {
Map<String, Object> map = new HashMap<String, Object>();
//update-begin---author:scott----date:20160906------for:参数不支持下划线解决--------
String regEx = ":[ tnx0Bfr]*[0-9a-z.A-Z_]+"; // 表示以：开头，[0-9或者.或者A-Z大小都写]的任意字符，超过一个
//update-begin---author:chenrui ---date:20231226 for：[jimu/issue/#2269]参数表达式新增中文支持------------
String regEx = ":[ tnx0Bfr]*[0-9a-z.A-Z_\\u4e00-\\u9fa5]+"; // 表示以：开头，[0-9或者.或者A-Z大小写或者中文汉字]的任意字符，超过一个
//update-end---author:chenrui ---date:20231226 for：[jimu/issue/#2269]参数表达式新增中文支持------------
//update-begin---author:scott----date:20160906------for:参数不支持下划线解决--------
Pattern pat = Pattern.compile(regEx);
Matcher m = pat.matcher(executeSql);
Expand Down