Merge branch 'master' of http://git.dayaedu.com/yonge/mec

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

@@ -62,14 +62,14 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee>  imp
 	public void add(Employee employee){
 		SysUser user = sysUserFeignService.queryUserByMobile(employee.getPhone());
 		if(user != null && user.getId() != null){
-			employee.setUserType(SysUserType.SYSTEM);
-			teacherDao.updateUser(employee);
 			Employee employee1 = employeeDao.get(user.getId());
 			if(employee1 == null){
 				employee.setUserId(user.getId());
 				employeeDao.insert(employee);
 				//新增用户角色
 				employeeDao.batchAddEmployeeRole(user.getId(),employee.getRoleIds());
+				employee.setUserType(SysUserType.SYSTEM);
+				teacherDao.updateUser(employee);
 			}else{
 				new BizException("员工已存在");
 			}

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

@@ -353,7 +353,6 @@
 
     <sql id="queryMusicGroupStudentSql">
         <where>
-                sr.music_group_status_ != 'QUIT'
             <if test="search != null and search != ''">
                 AND (su.real_name_ like CONCAT("%",#{search},"%") OR sr.parents_phone_ like CONCAT("%",#{search},"%"))
             </if>

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

@@ -463,7 +463,7 @@
             COUNT(cs.id_) as 'value'
         FROM
             course_schedule cs
-            WHERE cs.status_="NOT_START" AND cs.type_="VIP" AND cs.music_group_id_=#{vipGroupId} AND cs.group_type_='VIP'
+            WHERE cs.status_="NOT_START" AND cs.type_ = 'VIP' AND cs.music_group_id_=#{vipGroupId} AND cs.group_type_='VIP'
             GROUP BY cs.teach_mode_
     </select>