update

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/ExamOrganizationRelationServiceImpl.java

@@ -105,7 +105,7 @@ public class ExamOrganizationRelationServiceImpl extends BaseServiceImpl<Long, E
 
 	@Override
 	public List<ExamOrganizationRelationExtraDto> getChildOrgans(Long examId, Integer organId) {
-		List<Integer> childOrganIds = organizationService.getChildOrganIds(organId, false);
+		List<Integer> childOrganIds = organizationService.getChildOrganIds(organId, true);
 		return examOrganizationRelationDao.getExamChildOrgans(examId,childOrganIds);
 	}
 

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/ExamRoomServiceImpl.java

@@ -275,8 +275,12 @@ public class ExamRoomServiceImpl extends BaseServiceImpl<Long, ExamRoom> impleme
 		Map<Integer, String> subjectIdNameMap = this.getMap("subject", "id_", "name_", subjectIds, Integer.class, String.class);
 		examRoom.setSubjectNameList(StringUtils.join(subjectIdNameMap.values(),","));
 
-		examRoom.setExamStartTime(existExamRoom.getExamStartTime());
-		examRoom.setExamEndTime(existExamRoom.getExamEndTime());
+		if(Objects.isNull(examRoom.getExamStartTime())){
+			examRoom.setExamStartTime(existExamRoom.getExamStartTime());
+		}
+		if(Objects.isNull(examRoom.getExamEndTime())){
+			examRoom.setExamEndTime(existExamRoom.getExamEndTime());
+		}
 
 		List<ExamRoom> examRooms=new ArrayList<>(Arrays.asList(examRoom));
 		checkRoomTeachers(examRooms);