1

web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseStudentSigninSettingQuery.java

@@ -27,7 +27,7 @@ public class TeacherOpenCourseStudentSigninSettingQuery extends PageParam {
     @Query(name = "开课ID", display = true,type=Query.TYPE_DICT,dict="teacher_open_course.teacher_open_course_title.teacher_open_course_status=1")
     private Long teacherOpenCourseId;
     @Query(name = "班级ID集合", display = true,type=Query.TYPE_DICT,dict="school_class.class_name.class_status=1")
-    @Pattern(regexp = "/(ALL|\\d+)/g", message = "班级ID集合不能为空", groups = ValidateConfig.ADD.class)
+    @Pattern(regexp = "ALL|\\d+", message = "班级ID集合不能为空", groups = ValidateConfig.ADD.class)
     @NotBlank(message = "班级ID集合不能为空", groups =ValidateConfig.ADD.class)
     private String schoolClassIds;
     @Query(name = "签到方式 (数据字典 student_signin_type)", display = true,type=Query.TYPE_DICT,dict="student_signin_type")
@@ -80,12 +80,12 @@ public class TeacherOpenCourseStudentSigninSettingQuery extends PageParam {
      */
     public void tryToValidTeacherOpenCourseStudentSigninSettingValue() {
         String signinSettingValue = this.getTeacherOpenCourseStudentSigninSettingValue();
-        if(StringUtils.isNotBlank(signinSettingValue)) {
+        if(StringUtils.isBlank(signinSettingValue)) {
             return;
         }
 
         final String signinSettingType = this.getTeacherOpenCourseStudentSigninSettingType();
-        if(signinSettingType.equals(ip_signin)) {
+        if(signinSettingType.equals(ip_signin.name())) {
             try {
                 for (String range : signinSettingValue.split(",")) {
                     Assert.isTrue(range.split(IP_SPLIT_MARK).length == 2, "IP段必须要有开始IP和结束IP！");
@@ -93,10 +93,10 @@ public class TeacherOpenCourseStudentSigninSettingQuery extends PageParam {
             }catch (Exception e) {
                 Assert.isTrue(StringUtils.isEmpty(e.getMessage()), e.getMessage());
             }
-        } else if(signinSettingType.equals(manual_signin)) {
+        } else if(signinSettingType.equals(manual_signin.name())) {
             Assert.isTrue(StringUtils.isBlank(signinSettingType), "手动签到，配置参数值必须为空！");
         }
-        else if(signinSettingType.equals(code_signin)) {
+        else if(signinSettingType.equals(code_signin.name())) {
             Assert.isTrue(signinSettingType.length() == 6, "验证码签到，配置参数值长度必须是6位！");
         }
     }