From 86dffc98afb27f33a7d7b1323fd9a6e65d476bab Mon Sep 17 00:00:00 2001
From: zzc <Zhengzhic18@163.com>
Date: Mon, 17 Mar 2025 22:11:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE=E6=BA=90bu?=
 =?UTF-8?q?g?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../framework/aspectj/AdminGlobalDataSourceAspect.java         | 3 +--
 .../src/main/resources/mapper/dao/ScreeningDetailDao.xml       | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/acupuncture-framework/src/main/java/com/acupuncture/framework/aspectj/AdminGlobalDataSourceAspect.java b/acupuncture-framework/src/main/java/com/acupuncture/framework/aspectj/AdminGlobalDataSourceAspect.java
index a2ef04ab..ec5ab7d6 100644
--- a/acupuncture-framework/src/main/java/com/acupuncture/framework/aspectj/AdminGlobalDataSourceAspect.java
+++ b/acupuncture-framework/src/main/java/com/acupuncture/framework/aspectj/AdminGlobalDataSourceAspect.java
@@ -42,8 +42,7 @@ public class AdminGlobalDataSourceAspect {
 
     private static final String DATASOURCE_NOT_FOUND = "未找到数据源";
 
-    @Pointcut("(execution(* com.acupuncture.web.controller..*.*(..)))  && !@annotation(com.acupuncture.common.annotation.DataSource)" +
-            "|| @within(com.acupuncture.web.task.*)")
+    @Pointcut("(execution(* com.acupuncture.web.controller..*.*(..)))  && !@annotation(com.acupuncture.common.annotation.DataSource)")
     public void dsPointCut() {
 
     }
diff --git a/acupuncture-system/src/main/resources/mapper/dao/ScreeningDetailDao.xml b/acupuncture-system/src/main/resources/mapper/dao/ScreeningDetailDao.xml
index 54db2bbd..e7ec883f 100644
--- a/acupuncture-system/src/main/resources/mapper/dao/ScreeningDetailDao.xml
+++ b/acupuncture-system/src/main/resources/mapper/dao/ScreeningDetailDao.xml
@@ -88,7 +88,7 @@
                 </if>
             </if>
             <if test="param.tenantId != null">
-                and r.tenant_id = #{tenantId}
+                and r.tenant_id = #{param.tenantId}
             </if>
             <if test="param.startTime != null and param.startTime != ''">
                 and r.create_time &gt;= #{param.startTime}