fengji 团练宝查询记录去掉乐团限制

mec-biz/src/main/java/com/ym/mec/biz/service/impl/TenantCloudCourseRecordServiceImpl.java

@@ -2,6 +2,8 @@ package com.ym.mec.biz.service.impl;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ym.mec.auth.api.client.SysUserFeignService;
+import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.TenantCloudCourseRecordDao;
 import com.ym.mec.biz.dal.entity.TenantCloudCourseRecord;
 import com.ym.mec.biz.dal.vo.TenantCloudCourseRecordVo;
@@ -10,6 +12,7 @@ import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.page.PageUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -24,10 +27,15 @@ import java.util.Map;
 @Service("tenantCloudCourseRecordService")
 public class TenantCloudCourseRecordServiceImpl extends ServiceImpl<TenantCloudCourseRecordDao, TenantCloudCourseRecord> implements TenantCloudCourseRecordService {
 
+    @Autowired
+    private SysUserFeignService sysUserFeignService;
     private final static Logger logger = LoggerFactory.getLogger(TenantCloudCourseRecordServiceImpl.class);
 
     @Override
     public PageInfo<TenantCloudCourseRecordVo> queryPage(Map<String, Object> param) {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        param.put("tenantId", sysUser.getTenantId());
+
         Page<TenantCloudCourseRecordVo> pageInfo = PageUtil.getPageInfo(param);
         pageInfo.setAsc("a.created_time_");
         return PageUtil.pageInfo(baseMapper.queryPage(pageInfo, param));

mec-biz/src/main/resources/config/mybatis/CloudTeacherOrderMapper.xml

@@ -375,7 +375,9 @@
         LEFT JOIN student_registration sr ON cto.student_id_ = sr.user_id_
         <where>
             cto.status_ = 2 AND tor.order_no_ is not null AND tor.order_type_ = 'CLOUD_TEACHER'
-            AND sr.music_group_id_ = #{musicGroupId}
+            <if test="musicGroupId != null and musicGroupId != ''">
+                AND sr.music_group_id_ = #{musicGroupId}
+            </if>
             <if test="queryCondition != null and queryCondition != ''">
                 AND (u.username_ LIKE CONCAT('%', #{queryCondition}, '%') or u.phone_ = #{queryCondition} or u.id_ = #{queryCondition})
             </if>
@@ -418,7 +420,9 @@
         LEFT JOIN student_registration sr ON cto.student_id_ = sr.user_id_
         <where>
             cto.status_ = 2 AND tor.order_no_ is not null AND tor.order_type_ = 'CLOUD_TEACHER'
-            AND sr.music_group_id_ = #{musicGroupId}
+            <if test="musicGroupId != null and musicGroupId != ''">
+                AND sr.music_group_id_ = #{musicGroupId}
+            </if>
             <if test="queryCondition != null and queryCondition != ''">
                 AND (u.username_ LIKE CONCAT('%', #{queryCondition}, '%') or u.phone_ = #{queryCondition} or u.id_ = #{queryCondition})
             </if>

mec-biz/src/main/resources/config/mybatis/TenantCloudCourseRecordMapper.xml

@@ -32,17 +32,15 @@
         b.status_ as `status`,
         a.deduct_state_ as deductState,
         a.amount_ as amount
-        from
-        tenant_info as t
-        join tenant_cloud_course_record as a
-        on t.id_ = a.tenant_id_
-        left join course_schedule as b
-        on a.course_id_ = b.id_
-        left join sys_user as s
-        on b.teacher_id_ = s.id_
-        left join organization as o
-        on o.id_ = b.organ_id_
-        <where>
+        from tenant_info as t
+        join tenant_cloud_course_record as a  on t.id_ = a.tenant_id_
+        left join course_schedule as b        on a.course_id_ = b.id_
+        left join sys_user as s               on b.teacher_id_ = s.id_
+        left join organization as o           on o.id_ = b.organ_id_
+        <where> 1 = 1
+            <if test="param.tenantId != null ">
+                AND t.id_ = #{param.tenantId}
+            </if>
             <if test="param.search != null ">
                 AND (
                 b.`id_` LIKE CONCAT('%', #{param.search},'%')