Merge branch 'err_data_export'

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

@@ -201,7 +201,7 @@
 			AND del_flag_=0
 			AND INTE_ARRAY(organ_id_,#{organIds})
 			<if test="applyToStudentType!=null">
-				AND apply_to_student_type_=#{applyToStudentType}
+				AND (apply_to_student_type_=#{applyToStudentType} OR apply_to_student_type_=-1)
 			</if>
 	</select>
     <select id="queryNamesById" resultType="java.util.Map">

mec-teacher/src/main/java/com/ym/mec/teacher/controller/VipGroupActivityController.java

@@ -85,9 +85,11 @@ public class VipGroupActivityController extends BaseController {
         }
         long newStudentNum = students.stream().filter(s -> s.getIsNewUser()).count();
 
-        Integer applyToStudentType = null;
-        if(newStudentNum!=userIds.size()){
-            applyToStudentType = -1;
+        Integer applyToStudentType = -1;
+        if(newStudentNum==0){
+            applyToStudentType = 0;
+        }else if(newStudentNum==userIds.size()){
+            applyToStudentType = 1;
         }
 
         SysUser student = teacherDao.getUser(userIds.get(0));

mec-web/src/main/java/com/ym/mec/web/controller/VipGroupActivityController.java

@@ -115,9 +115,11 @@ public class VipGroupActivityController extends BaseController {
         }
         long newStudentNum = students.stream().filter(s -> s.getIsNewUser()).count();
 
-        Integer applyToStudentType = null;
-        if(newStudentNum!=userIds.size()){
-            applyToStudentType = -1;
+        Integer applyToStudentType = -1;
+        if(newStudentNum==0){
+            applyToStudentType = 0;
+        }else if(newStudentNum==userIds.size()){
+            applyToStudentType = 1;
         }
 
         SysUser student = teacherDao.getUser(userIds.get(0));