Merge remote-tracking branch 'origin/develop' into test

service-daq/src/main/java/com/simuwang/daq/service/EmailParseService.java

@@ -227,9 +227,7 @@ public class EmailParseService {
         if (Objects.equals(EmailTypeConst.REPORT_EMAIL_TYPE, emailType) && CollUtil.isNotEmpty(dataList)) {
             failReason = dataList.stream().filter(e -> !Objects.equals(1, e.getStatus()))
                     .findFirst().map(ParseResult::getMsg).orElse(null);
-            if (failReason != null) {
-                emailParseStatus = EmailParseStatusConst.FAIL;
-            }
+            emailParseStatus = failReason != null ? EmailParseStatusConst.FAIL : EmailParseStatusConst.SUCCESS;
         }
         emailParseInfoMapper.updateParseStatus(emailId, emailParseStatus, failReason);
     }