debug

src/main/java/com/cmeeting/job/FileProcessTask.java

@@ -366,12 +366,11 @@ public class FileProcessTask {
      */
     private Long choiceTemplateType(String subject) {
         Long type = 1L;
-        List<MeetType> meetTypeList = meetTypeService.list(new LambdaQueryWrapper<MeetType>().select(MeetType::getId, MeetType::getName));
+        List<MeetType> meetTypeList = meetTypeService.list(new LambdaQueryWrapper<MeetType>().select(MeetType::getId, MeetType::getName, MeetType::getRegex).ne(MeetType::getName, "重要"));
         if (CollUtil.isNotEmpty(meetTypeList)) {
             type = meetTypeList.get(0).getId();
             for (MeetType meetType : meetTypeList) {
-                if ((StrUtil.isNotBlank(meetType.getRegex()) && checkRegex(meetType.getRegex(), subject))
-                        || subject.contains(meetType.getName())) {
+                if (checkRegex(meetType.getRegex(), subject) || subject.contains(meetType.getName())) {
                     type = meetType.getId();
                     break;
                 }
@@ -381,6 +380,9 @@ public class FileProcessTask {
     }
 
     private boolean checkRegex(String regex, String subject) {
+        if (StrUtil.isBlank(regex)) {
+            return false;
+        }
         Pattern pattern = Pattern.compile(regex, Pattern.CASE_INSENSITIVE);
         return pattern.matcher(subject).find();
     }