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 a2ef04ab8..ec5ab7d67 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 54db2bbd2..e7ec883f8 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 @@
- and r.tenant_id = #{tenantId}
+ and r.tenant_id = #{param.tenantId}
and r.create_time >= #{param.startTime}