Merge remote-tracking branch 'origin/master' into bate

@@ -544,21 +544,15 @@ class ProjectUpdate extends Command
                     $url = $api_url . '?' . http_build_query(['w' => $api_type, 'page' => 1, 'pagesize' => 0]);
                     $url = $api_url . '?' . http_build_query(['w' => $api_type, 'page' => 1, 'pagesize' => 0]);
                     $data = curl_c($url);
                     $data = curl_c($url);
                     if (isset($data['code']) && $data['code'] == 200) {
                     if (isset($data['code']) && $data['code'] == 200) {
-                        $category = $data['data']['category'] ?? [];
-                        if (empty($category)) {
-                            $route_model = new RouteMap();
-                            $route_page = $route_model->read(['source' => 'page', 'route' => $custom_info['route']], 'id');
-                            if (!$route_page) {
                         $category = [
                         $category = [
                             [
                             [
                                 'id' => 0,
                                 'id' => 0,
                                 'name' => $custom_info['route'],
                                 'name' => $custom_info['route'],
                                 'url' => '/' . $custom_info['route'],
                                 'url' => '/' . $custom_info['route'],
-                                        'parent' => 0
+                                'parent' => 0,
+                                'children' => $data['data']['category'] ?? []
                             ]
                             ]
                         ];
                         ];
-                            }
-                        }
                         $this->category_custom_insert($project_id, $custom_info['id'], $category, 0);
                         $this->category_custom_insert($project_id, $custom_info['id'], $category, 0);
 
 
                         $count = $data['data']['count'] ?? 0;
                         $count = $data['data']['count'] ?? 0;

@@ -94,9 +94,8 @@ class UpdateProductCategory extends Command
         if(!empty($cate_arr) && is_array($cate_arr)){
         if(!empty($cate_arr) && is_array($cate_arr)){
             foreach ($cate_arr as $v){
             foreach ($cate_arr as $v){
                 $categoryModel = new Category();
                 $categoryModel = new Category();
-                $info = $categoryModel->read(['pid'=>$v],['id']);
-                if($info !== false){
-                    //有下级时，跳过
+                $info = $categoryModel->read(['id'=>$v],['id']);
+                if($info === false){
                     continue;
                     continue;
                 }else{
                 }else{
                     //更新关联表
                     //更新关联表

@@ -154,18 +154,19 @@ class NewsController extends BaseController
 
 
 
 
     /**
     /**
-     * @name :添加新闻时获取分类列表
-     * @author :liyuhang
-     * @method
+     * 添加新闻时获取分类列表
+     * @param NewsLogic $newsLogic
+     * @throws \App\Exceptions\BsideGlobalException
      */
      */
     public function get_category_list(NewsLogic $newsLogic){
     public function get_category_list(NewsLogic $newsLogic){
         $list = $newsLogic->news_get_category_list();
         $list = $newsLogic->news_get_category_list();
         $this->response('success',Code::SUCCESS,$list);
         $this->response('success',Code::SUCCESS,$list);
     }
     }
+
     /**
     /**
-     * @name :获取详情
-     * @author :liyuhang
-     * @method
+     * 获取新闻详情
+     * @param NewsLogic $newsLogic
+     * @throws \App\Exceptions\BsideGlobalException
      */
      */
     public function info(NewsLogic $newsLogic){
     public function info(NewsLogic $newsLogic){
         $this->request->validate([
         $this->request->validate([
@@ -174,6 +175,10 @@ class NewsController extends BaseController
             'id.required' => 'ID不能为空',
             'id.required' => 'ID不能为空',
         ]);
         ]);
         $info = $newsLogic->newsInfo();
         $info = $newsLogic->newsInfo();
+
+        $template_id = $this->getTemplateId(BTemplate::SOURCE_NEWS,BTemplate::IS_DETAIL);//获取模版id
+        $info['is_renovation']  =  $this->getIsRenovation(BTemplate::SOURCE_NEWS,BTemplate::IS_DETAIL,$template_id, $info['id']);
+
         $this->response('success',Code::SUCCESS,$info);
         $this->response('success',Code::SUCCESS,$info);
     }
     }