Merge remote-tracking branch 'origin/master'

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

@@ -201,17 +201,17 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee>  imp
 	public Map<String, Object> levelDetail(Integer userId) {
 		Map<String,Object> resultMap = new HashMap<>(4);
 		//维修技师所在分部列表
-		List<Integer> repairOrgans = employeeDao.queryRepairOrganList(userId);
-		resultMap.put("repairOrgans",repairOrgans);
+		List<Integer> repair = employeeDao.queryRepairOrganList(userId);
+		resultMap.put("repair",repair);
 		//教务老师所在分部列表
-		List<Integer> educationOrgans = employeeDao.queryEducationOrganList(userId);
-		resultMap.put("educationOrgans",educationOrgans);
+		List<Integer> education = employeeDao.queryEducationOrganList(userId);
+		resultMap.put("education",education);
 		//运营主管所在分部列表
-		List<Integer> teamTeacherOrgans = employeeDao.queryTeamTeacherOrganList(userId);
-		resultMap.put("teamTeacherOrgans",teamTeacherOrgans);
+		List<Integer> teamTeacher = employeeDao.queryTeamTeacherOrganList(userId);
+		resultMap.put("teamTeacher",teamTeacher);
 		//乐队指导所在分部列表
-		List<Integer> directorOrgans = employeeDao.queryDirectorOrganList(userId);
-		resultMap.put("directorOrgans",directorOrgans);
+		List<Integer> director = employeeDao.queryDirectorOrganList(userId);
+		resultMap.put("director",director);
 		return resultMap;
 	}
 
@@ -254,6 +254,6 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee>  imp
 //		imFeignService.groupBatchQuit(groupModels);
 //		employeeDao.employeeLevel(employeeLevelDtos);
 		//用户退群和加群
-		employeeDao.updateUserDemissionDate(levelUserId);
+//		employeeDao.updateUserDemissionDate(levelUserId);
 	}
 }

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

@@ -494,10 +494,10 @@
         LEFT JOIN vip_group vg ON vg.id_ = cg.music_group_id_
         LEFT JOIN courses_group csg ON csg.id_ = cg.music_group_id_
         WHERE cgtm.user_id_ != #{userId} AND cg.del_flag_ = 0
-        AND ((vg.group_status_ = 2 AND vg.educational_teacher_id_ =  #{userId} AND vg.organ_id_ = #{organId} AND cg.group_type_ = 'VIP')
+        AND ((vg.group_status_ = 2 AND vg.educational_teacher_id_ =  #{userId} AND cg.group_type_ = 'VIP')
         OR (mg.status_ = 'PROGRESS' AND (mg.team_teacher_id_ = #{userId} OR mg.educational_teacher_id_ = #{userId} OR mg.director_user_id_ = #{userId})
-        AND mg.organ_id_ = #{organId} AND cg.group_type_ = 'MUSIC')
-        OR (csg.status_ = 'NORMAL' AND csg.educational_teacher_id_ =  #{userId} AND csg.organ_id_ = #{organId} AND cg.group_type_ = 'COMM'))
+        AND cg.group_type_ = 'MUSIC')
+        OR (csg.status_ = 'NORMAL' AND csg.educational_teacher_id_ =  #{userId} AND cg.group_type_ = 'COMM'))
         GROUP BY cg.id_
     </select>