Merge branch 'dev'

123

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

@@ -80,10 +80,10 @@ public class TEExamController {
             throw new BusinessException("考试模式不能为空");
         }
         if (Objects.isNull(teExamDto.getName()) || Objects.equals(teExamDto.getName(), "")) {
-            throw new BusinessException("考试名称不能为空");
+            throw new BusinessException("批次名称不能为空");
         }
         if (Objects.isNull(teExamDto.getCode()) || Objects.equals(teExamDto.getCode(), "")) {
-            throw new BusinessException("考试编码不能为空");
+            throw new BusinessException("批次编码不能为空");
         }
         TEExam teExam = null;
         Long oldId = null;

themis-business/src/main/java/com/qmth/themis/business/enums/FieldUniqueEnum.java

@@ -25,7 +25,7 @@ public enum FieldUniqueEnum {
 
     t_b_exam_invigilate_user_orgId_userId_roomCode_Idx("监考员"),
 
-    t_b_user_loginName_orgId_Idx("用户名"),
+    t_b_user_loginName_orgId_Idx("登录名"),
 
     t_ie_exam_invigilate_call_recordId_source_Idx("监考视频源");
 
@@ -62,7 +62,7 @@ public enum FieldUniqueEnum {
      */
     public static String convertToCode(String value) {
         for (FieldUniqueEnum e : FieldUniqueEnum.values()) {
-            if (Objects.equals(value.trim(), e.name())) {
+            if (value.trim().contains(e.name())) {
                 return e.code;
             }
         }