修改数据源bug

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() {
 
     }

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}