Merge branch 'dev'

123#

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

@@ -42,6 +42,8 @@
         from
         <include refid="queryCommon"/>
         group by
+        t.examId,
+        t.examName,
         t.roomCode,
         t.roomName
     </select>
@@ -56,6 +58,8 @@
         from
         <include refid="queryCommon"/>
         group by
+        t.examId,
+        t.examName,
         t.roomCode,
         t.roomName
     </select>

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

@@ -17,7 +17,7 @@
             tbth.finish_time as finishTime,
             tbth.create_id as createId,
             tbth.import_file_name as importFileName,
-            (select tee.name from t_e_exam tee where tba.id = tbth.entity_id) as entityName,
+            (select tee.name from t_e_exam tee where tee.id = tbth.entity_id) as entityName,
             (
             select
                 tbu.name