fix:同时校验搜索发现时，搜索正常发现为空时校验停止的bug

2022-02-02 22:23:43 +08:00
parent a66bf6f436
commit c3c8649010
1 changed files with 11 additions and 8 deletions
@@ -144,15 +144,18 @@ class CheckSourceService : BaseService() {
                    }
                }
                if (url.isNullOrBlank()) {
-                    if (source.hasGroup("搜索失效")) {
-                        throw NoStackTraceException("搜索内容为空并且没有发现")
-                    } else {
-                        throw NoStackTraceException("没有发现")
+                    when {
+                        !CheckSource.checkSearch -> throw NoStackTraceException("没有发现")
+                        source.hasGroup("搜索失效") -> throw NoStackTraceException("搜索内容为空并且没有发现")
+                    }
+                } else {
+                    books = WebBook.exploreBookAwait(this, source, url)
+                    if (books.isEmpty()) {
+                        when {
+                            !CheckSource.checkSearch -> throw NoStackTraceException("发现书籍为空")
+                            source.hasGroup("搜索失效") -> throw NoStackTraceException("搜索内容和发现书籍为空")
+                        }
                    }
-                }
-                books = WebBook.exploreBookAwait(this, source, url)
-                if (books.isEmpty()) {
-                    throw NoStackTraceException("发现书籍为空")
                }
            }
            //校验详情