zouxuan 3 vuotta sitten
vanhempi
commit
c1739f7eea

+ 1 - 1
mec-biz/src/main/java/com/ym/mec/biz/dal/dao/StudentOperatingVisitDao.java

@@ -22,5 +22,5 @@ public interface StudentOperatingVisitDao extends BaseDAO<Long, StudentOperating
 
     List<Integer> queryUserIds(@Param("month") String month);
 
-    List<StudentOperatingVisit> sumVisit(@Param("month") String month);
+    List<StudentOperatingVisit> sumVisit(@Param("month") String month, @Param("tenantId") Integer tenantId);
 }

+ 2 - 1
mec-biz/src/main/java/com/ym/mec/biz/service/impl/ExportServiceImpl.java

@@ -376,7 +376,8 @@ public class ExportServiceImpl implements ExportService {
         if(StringUtils.isEmpty(month)){
             throw new BizException("请选择导出时间");
         }
-        return studentOperatingVisitDao.sumVisit(month);
+        Integer tenantId = TenantContextHolder.getTenantId();
+        return studentOperatingVisitDao.sumVisit(month,tenantId.equals("-1")?null:tenantId);
     }
 
 

+ 3 - 0
mec-biz/src/main/resources/config/mybatis/StudentOperatingVisitMapper.xml

@@ -95,6 +95,9 @@ month_ = #{month},
 		FROM student_operating_visit sov
 		left join organization o on sov.organ_id_ = o.id_
 		WHERE sov.month_ = #{month}
+		<if test="tenantId != null">
+			AND o.tenant_id_ = #{tenantId}
+		</if>
 		group by sov.organ_id_
 	</select>
 </mapper>