Merge branch 'master' of http://git.dayaedu.com/yonge/edu-saas

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

@@ -448,9 +448,6 @@ public class ExamOrganizationRelationServiceImpl extends BaseServiceImpl<Long, E
 		List<ExamOrganizationRelation> examOrgans = examOrganizationRelationDao.getOrganInfoWithExam(examId.intValue());
 		Map<Integer, String> userPhoneMap = new HashMap<>();
 		for (ExamOrganizationRelation examOrgan : examOrgans) {
-			if(examOrgan.getOrganId().equals(exam.getOrganId())){
-				continue;
-			}
 			userPhoneMap.put(examOrgan.getOrganization().getUserId(), examOrgan.getOrganization().getContactPhone());
 		}
 

edu-user/edu-user-server/src/main/resources/config/mybatis/ExamOrganizationRelationMapper.xml

@@ -336,6 +336,7 @@
 
 	<sql id="queryUnRelatedOrgansCondition">
 		<where>
+			o.del_flag_=0
 			<if test="tenantId != null and tenantId != 0">
 				AND o.tenant_id_ = #{tenantId}
 			</if>