From 296392b094a3531cd80bb7974914f494751b2e16 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期四, 14 十二月 2023 16:07:30 +0800
Subject: [PATCH] !458 fix 修复 excel合并注解会根据第一合并列的结果来决定后续的列合并 Merge pull request !458 from simple/excel
---
ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/MybatisExceptionHandler.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/MybatisExceptionHandler.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/MybatisExceptionHandler.java
index 64463e6..c517fa7 100644
--- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/MybatisExceptionHandler.java
+++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/MybatisExceptionHandler.java
@@ -35,7 +35,7 @@
public R<Void> handleCannotFindDataSourceException(MyBatisSystemException e, HttpServletRequest request) {
String requestURI = request.getRequestURI();
String message = e.getMessage();
- if (message.contains("CannotFindDataSourceException")) {
+ if ("CannotFindDataSourceException".contains(message)) {
log.error("璇锋眰鍦板潃'{}', 鏈壘鍒版暟鎹簮", requestURI);
return R.fail("鏈壘鍒版暟鎹簮锛岃鑱旂郴绠＄悊鍛樼‘璁�");
}
--
Gitblit v1.9.3