fengji 去掉团练宝乐团Id

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

@@ -340,12 +340,8 @@
         left join student s on cto.student_id_ = s.user_id_
         left join sys_user u on cto.student_id_ = u.id_
         left join subject sj on s.subject_id_list_ = sj.id_
-        left join student_registration sr ON cto.student_id_ = sr.user_id_
         <where>
             cto.status_ = #{status} AND cto.tenant_id_ = #{tenantId}
-            <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>
@@ -361,12 +357,8 @@
         left join student s on cto.student_id_ = s.user_id_
         left join sys_user u on cto.student_id_ = u.id_
         left join subject sj on s.subject_id_list_ = sj.id_
-        left join student_registration sr ON cto.student_id_ = sr.user_id_
         <where>
             cto.status_ = #{status} AND cto.tenant_id_ = #{tenantId}
-            <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-web/src/main/java/com/ym/mec/web/controller/CloudTeacherOrderController.java

@@ -53,10 +53,6 @@ public class CloudTeacherOrderController extends BaseController {
     @PreAuthorize("@pcs.hasPermissions('cloudTeacherOrder/queryInActive')")
     public HttpResponseResult<PageInfo<CloudTeacherStudent>> queryInactive(@RequestBody CloudTeacherOrderQueryInfo cloudTeacherOrderQueryInfo) throws Exception {
         cloudTeacherOrderQueryInfo.setStatus(1);
-        // 去掉按乐团查询， 不同乐团学生有重复
-        // if (cloudTeacherOrderQueryInfo.getMusicGroupId() == null) {
-        //     throw new Exception("乐团Id必须填写");
-        // }
         return succeed(cloudTeacherOrderService.queryInactive(cloudTeacherOrderQueryInfo));
     }