Merge remote-tracking branch 'origin/master'

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

@@ -106,6 +106,12 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 				user.setRealName(organ.getContactName());
 				user.setPhone(organ.getContactPhone());
 				sysUserDao.update(user);
+				Employee employee = new Employee();
+				employee.setOrganId(organ.getId());
+				employee.setUserId(user.getId());
+				employee.setTenantId(organ.getTenantId());
+				employee.setEmployeeType("ORGAN");
+				employeeDao.insert(employee);
 			}else if(organization.getDelFlag() == YesOrNoEnum.YES){
 				SysUser sysUser1 = organization.getSysUser();
 				if(StringUtils.isEmpty(sysUser1.getUserType())){

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

@@ -203,7 +203,7 @@
 				</foreach>
 			</if>
 			<if test="examRoomId!=null">
-				AND er.id_=#{examRoomId}
+				AND er.id_ = #{examRoomId}
 			</if>
 			<if test="examId!=null">
 				AND er.examination_basic_id_ = #{examId}