Merge remote-tracking branch 'origin/master'

codegen/pom.xml

@@ -23,10 +23,15 @@
 			<groupId>org.freemarker</groupId>
 			<artifactId>freemarker</artifactId>
 		</dependency>
-		
+
 		<dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-        </dependency>
+			<groupId>mysql</groupId>
+			<artifactId>mysql-connector-java</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>com.ym</groupId>
+			<artifactId>mec-util</artifactId>
+		</dependency>
 	</dependencies>
 </project>

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/ClassGroupDao.java

@@ -240,7 +240,7 @@ public interface ClassGroupDao extends BaseDAO<Integer, ClassGroup> {
      * @param userId
      * @return
      */
-    List<ImGroupModel> queryEducationGroups(@Param("userId") Integer userId);
+    List<ImGroupModel> queryEducationGroups(@Param("userId") Integer userId, @Param("organId") Integer organId);
 
     /**
      * 获取运营主管关联的群列表
@@ -248,7 +248,7 @@ public interface ClassGroupDao extends BaseDAO<Integer, ClassGroup> {
      * @param userId
      * @return
      */
-    List<ImGroupModel> queryTeamTeacherGroups(@Param("userId") Integer userId);
+    List<ImGroupModel> queryTeamTeacherGroups(@Param("userId") Integer userId, @Param("organId") Integer organId);
 
     /**
      * 获取乐队指导关联的群列表
@@ -256,7 +256,7 @@ public interface ClassGroupDao extends BaseDAO<Integer, ClassGroup> {
      * @param userId
      * @return
      */
-    List<ImGroupModel> queryDirectorGroups(@Param("userId") Integer userId);
+    List<ImGroupModel> queryDirectorGroups(@Param("userId") Integer userId, @Param("organId") Integer organId);
 
     /**
      * 获取未分配合奏的单技班列表

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

@@ -227,22 +227,24 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee>  imp
 			Map<Integer, List<EmployeeLevelDto>> organIdMap = levelDtos.stream().collect(Collectors.groupingBy(e -> e.getOrganId()));
 			Set<Integer> organIds = organIdMap.keySet();
 			for (Integer organId : organIds) {
-
+				List<EmployeeLevelDto> levelDtoList = organIdMap.get(organId);
+				for (EmployeeLevelDto employeeLevelDto : levelDtoList) {
+					switch (roleName){
+						case "education":
+							//教务老师所需加入的群组
+							imGroupModels.addAll(classGroupDao.queryEducationGroups(levelUserId,organId));
+							break;
+						case "teamTeacher":
+							//运营主管所需加入的群组
+							imGroupModels.addAll(classGroupDao.queryTeamTeacherGroups(levelUserId,organId));
+							break;
+						case "director":
+							//乐队指导所需加入的群组
+							imGroupModels.addAll(classGroupDao.queryDirectorGroups(levelUserId,organId));
+							break;
+					}
+				}
 			}
-//			switch (roleName){
-//				case "education":
-//					//教务老师所需加入的群组
-//					imGroupModels.addAll(classGroupDao.queryEducationGroups(levelUserId));
-//					break;
-//				case "education":
-//					//教务老师所需加入的群组
-//					imGroupModels.addAll(classGroupDao.queryEducationGroups(levelUserId));
-//					break;
-//			}
-			//运营主管
-			imGroupModels.addAll(classGroupDao.queryTeamTeacherGroups(levelUserId));
-			//乐队指导
-			imGroupModels.addAll(classGroupDao.queryDirectorGroups(levelUserId));
 		}
 //		imFeignService.groupBatchJoin();
 		employeeDao.employeeLevel(employeeLevelDtos);

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

@@ -500,12 +500,13 @@
         SELECT cg.id_,CASE WHEN cg.group_name_ IS NULL OR cg.group_name_ = '' THEN cg.name_ ELSE cg.group_name_ END name_
         FROM class_group_teacher_mapper cgtm
         LEFT JOIN class_group cg ON cgtm.class_group_id_ = cg.id_
-        LEFT JOIN music_group mg ON mg.id_ = cg.music_group_id_ AND cg.group_type_ = 'MUSIC'
-        LEFT JOIN vip_group vg ON vg.id_ = cg.music_group_id_ AND cg.group_type_ = 'VIP'
-        LEFT JOIN courses_group csg ON csg.id_ = cg.music_group_id_ AND cg.group_type_ = 'COMM'
-        WHERE cgtm.user_id_ != #{userId} AND mg.educational_teacher_id_ = #{userId}
-        AND cg.del_flag_ = 0 AND ((mg.status_ = 'PROGRESS' OR vg.group_status_ = 2 OR csg.status_ = 'NORMAL')
-        OR (vg.group_status_ = 2 AND vg.educational_teacher_id_ =  #{userId}) OR (csg.status_ = 'NORMAL' AND csg.educational_teacher_id_ =  #{userId}))
+        LEFT JOIN music_group mg ON mg.id_ = cg.music_group_id_
+        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')
+        OR (mg.status_ = 'PROGRESS' AND mg.educational_teacher_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'))
         GROUP BY cg.id_
     </select>
 

mec-eureka/pom.xml

@@ -20,6 +20,12 @@
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-netflix-eureka-server</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>commons-lang</groupId>
+					<artifactId>commons-lang</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 
 		<dependency>

workflowy/pom.xml

@@ -64,6 +64,11 @@
 		</dependency>
 
 		<dependency>
+			<groupId>com.ym</groupId>
+			<artifactId>mec-util</artifactId>
+		</dependency>
+
+		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-dbcp2</artifactId>
 			<scope>provided</scope>