Merge remote-tracking branch 'origin/dev' into dev

themis-backend/src/main/java/com/qmth/themis/backend/api/TBExamInvigilateUserController.java

@@ -95,7 +95,7 @@ public class TBExamInvigilateUserController {
             if (userIds.size() > 0) {
                 TBOrg tbOrg = (TBOrg) ServletUtil.getRequestOrg();
                 QueryWrapper<TBExamInvigilateUser> tbExamInvigilateUserQueryWrapper = new QueryWrapper<>();
-                tbExamInvigilateUserQueryWrapper.lambda().eq(TBExamInvigilateUser::getRoomCode, roomCode);
+                tbExamInvigilateUserQueryWrapper.lambda().eq(TBExamInvigilateUser::getRoomCode, roomCode).eq(TBExamInvigilateUser::getExamId, examId);
                 if (Objects.nonNull(tbOrg) && Objects.isNull(tbOrg.getId())) {
                     throw new BusinessException("监考员机构id不允许为空");
                 }

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

@@ -100,7 +100,7 @@
             <if test="name != null and name != ''">
                 and t.name like concat('%', #{name}, '%')
             </if>
-            <if test="mode != null and mode != '' or mode == 0">
+            <if test="mode != null and mode != '' ">
                 and t.mode = #{mode}
             </if>
             <if test="enable != null and enable != '' or enable == 0">