Merge branch 'saas' of http://git.dayaedu.com/yonge/mec into master_saas

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

@@ -2480,7 +2480,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         if (courseScheduleList != null && courseScheduleList.size() > 0) {
             throw new BizException("退团失败，存在[进行中]的课程");
         }
-        if(reqMusicGroupQuit.getStatus() != APPROVED){
+        if(musicGroupQuit.getStatus() == PROCESSING && reqMusicGroupQuit.getStatus() == APPROVED){
             //是否是特定的可以一键退团的乐团主管
             if(hasRole){
                 status = APPROVED;

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

@@ -302,7 +302,6 @@ public class StudentVisitServiceImpl extends BaseServiceImpl<Integer, StudentVis
                         } else {
                             if ("已解决".equals(row.get(s).toString())) {
                                 objectMap.put(columnValue, 1);
-                                break;
                             }
                         }
                     }
@@ -314,7 +313,7 @@ public class StudentVisitServiceImpl extends BaseServiceImpl<Integer, StudentVis
                         throw new BizException("手机号{}不存在",cost.getPhone());
                     }
                     cost.setStudentId(user.getId());
-                    StudentRegistration studentRegistration = studentRegistrationDao.queryByUserIdAndMusicGroupId(cost.getStudentId(), cost.getMusicGroupId());
+                    StudentRegistration studentRegistration = studentRegistrationDao.getStudentRegister(cost.getMusicGroupId(),cost.getStudentId());
                     if(Objects.isNull(studentRegistration)){
                         throw new BizException("学员{}不在乐团{}中，无需回访",cost.getStudentId(),cost.getMusicGroupId());
                     }