Merge remote-tracking branch 'origin/master'

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

@@ -305,7 +305,7 @@
     <!-- 根据乐团和声部获取未分班的学生 -->
     <select id="getNoClassStuBySubjectId" resultMap="StudentRegistration">
         SELECT * FROM student_registration
-        WHERE music_group_id_ = #{musicGroupId} AND payment_status_ = 2 AND class_group_id_=0
+        WHERE music_group_id_ = #{musicGroupId} AND payment_status_ = 2 AND (class_group_id_= 0 OR class_group_id_ IS NULL)
         AND music_group_status_ != 'QUIT'
         <if test="actualSubjectId != null">
             AND FIND_IN_SET(actual_subject_id_,#{actualSubjectId})
@@ -319,7 +319,7 @@
     <!-- 根据乐团和声部获取未分班人数 -->
     <select id="getNoClassStuCountByMusicGroupId" resultMap="getNoClassStuCountByMusicGroupId">
         SELECT actual_subject_id_ ,COUNT(*) nums FROM student_registration
-        WHERE music_group_id_ = #{musicGroupId} AND payment_status_=2 AND class_group_id_=0
+        WHERE music_group_id_ = #{musicGroupId} AND payment_status_=2 AND (class_group_id_= 0 OR class_group_id_ IS NULL)
         AND music_group_status_ != 'QUIT'
         GROUP BY actual_subject_id_;
     </select>
@@ -401,7 +401,7 @@
         <if test="actualSubjectId != null">
             AND actual_subject_id_ = #{actualSubjectId}
         </if>
-        AND payment_status_ = 2 AND class_group_id_ =0 AND music_group_status_ != 'QUIT'
+        AND payment_status_ = 2 AND (class_group_id_= 0 OR class_group_id_ IS NULL) AND music_group_status_ != 'QUIT'
     </select>
 
 

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

@@ -17,7 +17,6 @@ import com.ym.mec.biz.dal.dao.EmployeeDao;
 import com.ym.mec.biz.dal.entity.VipGroupCategory;
 import com.ym.mec.biz.service.VipGroupCategoryService;
 import com.ym.mec.common.controller.BaseController;
-import com.ym.mec.common.page.QueryInfo;
 
 @Api(tags = "vip课类别")
 @RequestMapping("vipGroupCategory")
@@ -41,8 +40,8 @@ public class VipGroupCategoryController extends BaseController {
 	@ApiOperation("全查询")
 	@GetMapping(value = "/queryAll")
     @PreAuthorize("@pcs.hasPermissions('vipGroupCategory/queryAll')")
-	public Object queryAll(QueryInfo queryInfo) {
-		return succeed(vipGroupCategoryService.queryPage(queryInfo));
+	public Object queryAll() {
+		return succeed(vipGroupCategoryService.findAll(null));
 	}
 
 	@ApiOperation("获取教师课酬")