|
@@ -327,7 +327,7 @@ class NewsService implements NewsServiceInterface
|
|
|
}
|
|
}
|
|
|
$diff_pid_categoryIds = array_values($categorys['diff_pid_categoryIds']);
|
|
$diff_pid_categoryIds = array_values($categorys['diff_pid_categoryIds']);
|
|
|
// return Result::success($diff_pid_categoryIds);
|
|
// return Result::success($diff_pid_categoryIds);
|
|
|
- if (in_array(2, $website_column) && !empty($diff_pid_categoryIds)) {
|
|
|
|
|
|
|
+ if (in_array(3, $website_column) && !empty($diff_pid_categoryIds)) {
|
|
|
return Result::error("此为核心站,有父级导航" . implode(',', $diff_pid_categoryIds) . "未选择而选择了此子级!", 0);
|
|
return Result::error("此为核心站,有父级导航" . implode(',', $diff_pid_categoryIds) . "未选择而选择了此子级!", 0);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -511,7 +511,7 @@ class NewsService implements NewsServiceInterface
|
|
|
$catiall = $categorys['catiall'];
|
|
$catiall = $categorys['catiall'];
|
|
|
$diff_pid_categoryIds = array_values($categorys['diff_pid_categoryIds']);
|
|
$diff_pid_categoryIds = array_values($categorys['diff_pid_categoryIds']);
|
|
|
// return Result::success($diff_pid_categoryIds);
|
|
// return Result::success($diff_pid_categoryIds);
|
|
|
- if (in_array(2, $website_column) && !empty($diff_pid_categoryIds)) {
|
|
|
|
|
|
|
+ if (in_array(3, $website_column) && !empty($diff_pid_categoryIds)) {
|
|
|
return Result::error("此为核心站,有父级导航" . implode(',', $diff_pid_categoryIds) . "未选择而选择了此子级!", 0);
|
|
return Result::error("此为核心站,有父级导航" . implode(',', $diff_pid_categoryIds) . "未选择而选择了此子级!", 0);
|
|
|
}
|
|
}
|
|
|
if (isset($data['catid']) && !empty($data['catid'])) {
|
|
if (isset($data['catid']) && !empty($data['catid'])) {
|
|
@@ -951,7 +951,7 @@ class NewsService implements NewsServiceInterface
|
|
|
$diff_pid_categoryIds = array_values($categorys['diff_pid_categoryIds']);
|
|
$diff_pid_categoryIds = array_values($categorys['diff_pid_categoryIds']);
|
|
|
|
|
|
|
|
// return Result::success($diff_pid_categoryIds);
|
|
// return Result::success($diff_pid_categoryIds);
|
|
|
- if (in_array(2, $website_column) && !empty($diff_pid_categoryIds)) {
|
|
|
|
|
|
|
+ if (in_array(3, $website_column) && !empty($diff_pid_categoryIds)) {
|
|
|
return Result::error("此为核心站,有父级导航" . implode(',', $diff_pid_categoryIds) . "未选择而选择了此子级!", 0);
|
|
return Result::error("此为核心站,有父级导航" . implode(',', $diff_pid_categoryIds) . "未选择而选择了此子级!", 0);
|
|
|
}
|
|
}
|
|
|
// return Result::success(reset($diff_pid_categoryIds) == 0);
|
|
// return Result::success(reset($diff_pid_categoryIds) == 0);
|
|
@@ -1136,7 +1136,7 @@ class NewsService implements NewsServiceInterface
|
|
|
|
|
|
|
|
// return Result::success($catiall);
|
|
// return Result::success($catiall);
|
|
|
$diff_pid_categoryIds = $categorys['diff_pid_categoryIds'];
|
|
$diff_pid_categoryIds = $categorys['diff_pid_categoryIds'];
|
|
|
- if (in_array(2, $website_column) && !empty($diff_pid_categoryIds)) {
|
|
|
|
|
|
|
+ if (in_array(3, $website_column) && !empty($diff_pid_categoryIds)) {
|
|
|
return Result::error("此为核心站,有父级导航" . implode(',', $diff_pid_categoryIds) . "未选择而选择了此子级!", 0);
|
|
return Result::error("此为核心站,有父级导航" . implode(',', $diff_pid_categoryIds) . "未选择而选择了此子级!", 0);
|
|
|
}
|
|
}
|
|
|
$websiteInfoIndexed = $categorys['websiteInfoIndexed'];
|
|
$websiteInfoIndexed = $categorys['websiteInfoIndexed'];
|
|
@@ -1380,7 +1380,7 @@ private function fetchArticles($catId, $website, $limit, $isImageArticle = false
|
|
|
if(!empty($parent_category) && is_array($parent_category)){
|
|
if(!empty($parent_category) && is_array($parent_category)){
|
|
|
$categorys = $this->processArticlePro($website_id);
|
|
$categorys = $this->processArticlePro($website_id);
|
|
|
$diff_pid_categoryIds = $categorys['diff_pid_categoryIds'];
|
|
$diff_pid_categoryIds = $categorys['diff_pid_categoryIds'];
|
|
|
- if (in_array(2, $website_column) && !empty($diff_pid_categoryIds)) {
|
|
|
|
|
|
|
+ if (in_array(3, $website_column) && !empty($diff_pid_categoryIds)) {
|
|
|
return Result::error("此为核心站,有父级导航" . implode(',', $diff_pid_categoryIds) . "未选择而选择了此子级!", 0);
|
|
return Result::error("此为核心站,有父级导航" . implode(',', $diff_pid_categoryIds) . "未选择而选择了此子级!", 0);
|
|
|
}
|
|
}
|
|
|
$catiall = $categorys['catiall'];
|
|
$catiall = $categorys['catiall'];
|