云教练活动

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,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));
 
     /**
      * 获取节点树状结构

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

@@ -999,7 +999,7 @@
     <select id="findByUserAndActive" resultMap="StudentPaymentOrder">
         SELECT spo.* FROM cloud_teacher_order cto
         LEFT JOIN student_payment_order spo ON spo.id_ = cto.order_id_
-        WHERE spo.status_ NOT ('SUCCESS','ING') AND cto.active_remark_ = #{activeRemark}
+        WHERE spo.status_ IN ('SUCCESS','ING') AND cto.active_remark_ = #{activeRemark}
         AND cto.remark_ = #{remark} AND cto.student_id_ = #{userId}
         <if test="status != null and status != ''">
             AND spo.status_ = #{status}