From f2a0580c3e4ce75357f2aa3a03784bccd2ec6a7b Mon Sep 17 00:00:00 2001
From: qfuzj <qfuzj@qq.com>
Date: Thu, 17 Jul 2025 18:09:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=95=B0=E6=8D=AE=E6=BA=90?=
 =?UTF-8?q?=E6=B3=A8=E8=A7=A3=E6=9F=A5=E6=89=BE=E9=80=BB=E8=BE=91=EF=BC=8C?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E7=9B=AE=E6=A0=87=E7=B1=BB=E5=92=8C=E5=A3=B0?=
 =?UTF-8?q?=E6=98=8E=E7=B1=BB=E7=9A=84=E7=BB=84=E5=90=88=E6=A3=80=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/framework/aspectj/DataSourceAspect.java | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java
index 4648fcd3c..518a67a98 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java
@@ -67,6 +67,15 @@ public class DataSourceAspect
             return dataSource;
         }
 
-        return AnnotationUtils.findAnnotation(signature.getDeclaringType(), DataSource.class);
-    }
-}
+         // 组合检查声明类和目标类
+         Class<?> declaringType = signature.getDeclaringType();
+         Class<?> targetClass = point.getTarget().getClass();
+         
+         DataSource classAnnotation = AnnotationUtils.findAnnotation(targetClass, DataSource.class);
+         if (classAnnotation == null) {
+             classAnnotation = AnnotationUtils.findAnnotation(declaringType, DataSource.class);
+         }
+         return classAnnotation;
+     }
+ }
+