Merge branch 'dev_v1.2.2' into release_v1.2.2

merge

themis-business/src/main/resources/mapper/TEExamMapper.xml

@@ -48,8 +48,8 @@
         t.monitorRecord,
         t.monitorStatus
         <if test="type != null and type != '' and type == 'monitor'">
-            ,group_concat(distinct tees.room_code) as roomCode,
-            group_concat(distinct tees.room_name) as roomName
+            ,group_concat(distinct tbeiu.room_code) as roomCode,
+            group_concat(distinct tbeiu.room_name) as roomName
         </if>
         from
         (select t.id,
@@ -124,7 +124,7 @@
         </where>
         ) t
         <if test="type != null and type != '' and type == 'monitor'">
-            left join t_e_exam_student tees on tees.exam_id = t.id
+            left join t_b_exam_invigilate_user tbeiu on tbeiu.exam_id = t.id and tbeiu.user_id = #{userId} and tbeiu.org_id = #{orgId}
         </if>
         group by t.id,
         t.code,