Merge remote-tracking branch 'origin/online1' into online1

mec-biz/src/main/java/com/ym/mec/biz/service/OrganizationService.java

@@ -9,7 +9,7 @@ import java.util.*;
 
 public interface OrganizationService extends BaseService<Integer, Organization> {
 
-    Set<Integer>  EXCLUDE_ORGAN_IDS = new HashSet<>(Arrays.asList(36,38,39,41,42,43,44,45,46,47,48,49,50,52,54,55,56));
+    Set<Integer>  EXCLUDE_ORGAN_IDS = new HashSet<>(Arrays.asList(36,38,39,41,42,43,44,45,46,47,48,49,50,52,54,55,56,2,27,22,24));
 
     /**
      * 获取节点树状结构

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

@@ -290,7 +290,7 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
 
 		Integer userId = studentPaymentOrder.getUserId();
 
-		Student student = studentService.get(userId);
+		Student student = studentService.getLocked(userId);
 		if (student == null) {
 			throw new BizException("学员信息不存在");
 		}

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

@@ -625,6 +625,7 @@
         LEFT JOIN sys_user su ON sr.user_id_ = su.id_
         LEFT JOIN `subject` s ON s.id_ = sr.actual_subject_id_
         LEFT JOIN music_group mg ON sr.music_group_id_ = mg.id_
+        LEFT JOIN student stu ON sr.user_id_ = stu.user_id_
         <if test="classGroupId != null">
             LEFT JOIN class_group_student_mapper cgsm ON cgsm.music_group_id_ = sr.music_group_id_
         </if>

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

@@ -1333,7 +1333,7 @@
         -- 			非管乐
         AND su.id_ NOT IN (SELECT user_id_ FROM student WHERE subject_id_list_ REGEXP '21|25|26|27|28|29')
         -- 			声部排除
-        AND su.organ_id_ NOT IN (36,38,39,41,42,43,44,45,46,47,48,49,50,52,54,55,56,63)
+        AND su.organ_id_ NOT IN (36,38,39,41,42,43,44,45,46,47,48,49,50,52,54,55,56,63,2,27,22,24)
         -- 			购买了云教练
         AND su.id_ NOT IN (SELECT DISTINCT student_id_ FROM cloud_teacher_order WHERE active_remark_ IS NULL AND status_ != 0)
         -- 			未退团，不是会员团

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

@@ -1752,7 +1752,7 @@
         -- 			非管乐
         AND su.id_ NOT IN (SELECT user_id_ FROM student WHERE subject_id_list_ REGEXP '21|25|26|27|28|29')
         -- 			声部排除
-        AND su.organ_id_ NOT IN (36,38,39,41,42,43,44,45,46,47,48,49,50,52,54,55,56,63)
+        AND su.organ_id_ NOT IN (36,38,39,41,42,43,44,45,46,47,48,49,50,52,54,55,56,63,2,27,22,24)
         -- 			购买了云教练
         AND su.id_ NOT IN (SELECT DISTINCT student_id_ FROM cloud_teacher_order WHERE active_remark_ IS NULL AND status_ != 0)
         -- 			未退团，不是会员团