Joburgess 5 rokov pred
rodič
commit
d39feffc94

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

@@ -151,7 +151,7 @@ public class ExamRoomServiceImpl extends BaseServiceImpl<Long, ExamRoom> impleme
 
 		List<Integer> subjectIds = Arrays.stream(examRoom.getSubjectIdList().split(",")).map(e -> Integer.valueOf(e)).collect(Collectors.toList());
 		Map<Integer, String> subjectIdNameMap = this.getMap("subject", "id_", "name_", subjectIds, Integer.class, String.class);
-		examRoom.setSubjectNameList(StringUtils.join(subjectIdNameMap.keySet(),","));
+		examRoom.setSubjectNameList(StringUtils.join(subjectIdNameMap.values(),","));
 
 		List<ExamRoom> examRooms=new ArrayList<>();
 		List<JSONObject> examTimes = JSON.parseArray(examRoom.getExamTimeJson(), JSONObject.class);

+ 1 - 1
edu-user/edu-user-server/src/main/resources/config/mybatis/ExamRoomStudentRelationMapper.xml

@@ -124,7 +124,7 @@
 		<where>
 			er.status_='AUDIT_PASS'
 			<if test="organIds!=null">
-				AND ersr.organ_id_ IN
+				AND er.organ_id_ IN
 				<foreach collection="organIds" item="organI" separator="," open="(" close=")">
 					#{organI}
 				</foreach>

+ 1 - 1
edu-user/edu-user-server/src/main/resources/config/mybatis/TeacherMapper.xml

@@ -20,7 +20,7 @@
 		<result column="update_time_" property="updateTime" />
 		<result column="tenant_id_" property="tenantId" />
 		<result column="organ_id_" property="organId" />
-		<association property="sysUser" resultMap="com.keao.edu.user.dao.SysUserDao.SysUser"/>
+		<association property="sysUser" columnPrefix="sys_user_" resultMap="com.keao.edu.user.dao.SysUserDao.SysUser"/>
 	</resultMap>
 
 	<resultMap id="TeacherDto" type="com.keao.edu.user.dto.TeacherDto" extends="Teacher">