feat:双十一学员去除分部，之和指导教师挂钩

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

@@ -199,25 +199,6 @@ public class StudentManageServiceImpl implements StudentManageService {
         Map<String, Object> params = new HashMap<String, Object>();
         MapUtil.populateMap(params, queryInfo);
 
-        Teacher teacher = teacherDao.get(queryInfo.getTeacherId());
-        if (Objects.isNull(teacher)) {
-            return null;
-        }
-        List<Integer> organIds = new ArrayList<>();
-        if (Objects.nonNull(teacher.getTeacherOrganId())) {
-            organIds.add(teacher.getTeacherOrganId());
-        }
-        if (StringUtils.isNotBlank(teacher.getFlowOrganRange())) {
-            List<Integer> flowOrganRangeIds = Arrays.stream(teacher.getFlowOrganRange().split(",")).map(e -> Integer.valueOf(e)).collect(Collectors.toList());
-            organIds.addAll(flowOrganRangeIds);
-        }
-
-        if (CollectionUtils.isEmpty(organIds)) {
-            return null;
-        }
-
-        params.put("organIds", organIds);
-
         List<StudentVipDouble11Dto> dataList = new ArrayList<>();
         int count = studentPaymentOrderDao.countDouble11Students(params);
         if (count > 0) {

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

@@ -771,15 +771,13 @@
         FROM
             student_payment_order spo
             LEFT JOIN sporadic_charge_info sci ON spo.music_group_id_=sci.id_
+            LEFT JOIN student s ON spo.user_id_=s.user_id_
             LEFT JOIN sys_user su ON spo.user_id_ = su.id_
         WHERE
             spo.status_ = 'SUCCESS'
             AND spo.type_ = 'DOUBLE_ELEVEN2020'
             AND sci.title_ LIKE '双十一%'
-            AND sci.organ_id_ IN
-            <foreach collection="organIds" item="organId" open="(" close=")" separator=",">
-                #{organId}
-            </foreach>
+            AND s.teacher_id_= #{teacherId}
             <if test="search!=null and search!=''">
                 AND (su.phone_=#{search} OR su.username_ LIKE CONCAT('%', #{search}, '%'))
             </if>
@@ -794,15 +792,13 @@
         FROM
         student_payment_order spo
         LEFT JOIN sporadic_charge_info sci ON spo.music_group_id_=sci.id_
+        LEFT JOIN student s ON spo.user_id_=s.user_id_
         LEFT JOIN sys_user su ON spo.user_id_ = su.id_
         WHERE
-        spo.status_ = 'SUCCESS'
-        AND spo.type_ = 'DOUBLE_ELEVEN2020'
-        AND sci.title_ LIKE '双十一%'
-        AND sci.organ_id_ IN
-        <foreach collection="organIds" item="organId" open="(" close=")" separator=",">
-            #{organId}
-        </foreach>
+            spo.status_ = 'SUCCESS'
+            AND spo.type_ = 'DOUBLE_ELEVEN2020'
+            AND sci.title_ LIKE '双十一%'
+            AND s.teacher_id_= #{teacherId}
         <if test="search!=null and search!=''">
             AND (su.phone_=#{search} OR su.username_ LIKE CONCAT('%', #{search}, '%'))
         </if>;