gx

@@ -12,7 +12,10 @@ namespace App\Http\Controllers\Bside\CustomModule;
 use App\Enums\Common\Code;
 use App\Enums\Common\Code;
 use App\Http\Controllers\Bside\BaseController;
 use App\Http\Controllers\Bside\BaseController;
 use App\Http\Logic\Bside\CustomModule\CustomModuleCategoryLogic;
 use App\Http\Logic\Bside\CustomModule\CustomModuleCategoryLogic;
+use App\Models\CustomModule\CustomModule;
 use App\Models\CustomModule\CustomModuleCategory;
 use App\Models\CustomModule\CustomModuleCategory;
+use App\Models\Template\BTemplate;
+use App\Models\Template\Setting;
 use App\Models\User\User;
 use App\Models\User\User;
 
 
 class CustomModuleCategoryController extends BaseController
 class CustomModuleCategoryController extends BaseController
@@ -34,7 +37,9 @@ class CustomModuleCategoryController extends BaseController
         $this->map['status'] = 0;
         $this->map['status'] = 0;
         $list = $customModuleCategory->list($this->map,'sort');
         $list = $customModuleCategory->list($this->map,'sort');
         if(!empty($list)){
         if(!empty($list)){
+            $template_id = $this->getModuleTemplateId($this->param['module_id']);
             foreach ($list as $k => $v){
             foreach ($list as $k => $v){
+                $v['is_renovation']  =  $this->getIsRenovation($v['module_id'],BTemplate::IS_LIST,$template_id,$v['id'],BTemplate::IS_CUSTOM);
                 $v['url'] = $this->user['domain'].$v['route'];
                 $v['url'] = $this->user['domain'].$v['route'];
                 $list[$k] = $v;
                 $list[$k] = $v;
             }
             }
@@ -44,6 +49,25 @@ class CustomModuleCategoryController extends BaseController
     }
     }
 
 
     /**
     /**
+     * @remark :扩展模块获取模版id
+     * @name   :getTemplateId
+     * @author :lyh
+     * @method :post
+     * @time   :2024/1/31 16:47
+     */
+    public function getModuleTemplateId($module_id){
+        $template_id = 0;
+        $moduleModel = new CustomModule();
+        $info = $moduleModel->read(['id'=>$module_id]);
+        if($info['list_customized'] != 1){
+            $bSettingModel = new Setting();
+            $info = $bSettingModel->read(['project_id'=>$this->user['project_id']]);
+            $template_id = $info['template_id'];
+        }
+        return $this->success($template_id);
+    }
+
+    /**
      * @remark :无分页子集处理
      * @remark :无分页子集处理
      * @name   :getListSon
      * @name   :getListSon
      * @author :lyh
      * @author :lyh

@@ -12,9 +12,12 @@ namespace App\Http\Controllers\Bside\CustomModule;
 use App\Enums\Common\Code;
 use App\Enums\Common\Code;
 use App\Http\Controllers\Bside\BaseController;
 use App\Http\Controllers\Bside\BaseController;
 use App\Http\Logic\Bside\CustomModule\CustomModuleContentLogic;
 use App\Http\Logic\Bside\CustomModule\CustomModuleContentLogic;
+use App\Models\CustomModule\CustomModule;
 use App\Models\CustomModule\CustomModuleCategory;
 use App\Models\CustomModule\CustomModuleCategory;
 use App\Models\CustomModule\CustomModuleContent;
 use App\Models\CustomModule\CustomModuleContent;
 use App\Models\RouteMap\RouteMap;
 use App\Models\RouteMap\RouteMap;
+use App\Models\Template\BTemplate;
+use App\Models\Template\Setting;
 use App\Models\User\User;
 use App\Models\User\User;
 
 
 class CustomModuleContentController extends BaseController
 class CustomModuleContentController extends BaseController
@@ -35,12 +38,14 @@ class CustomModuleContentController extends BaseController
         $this->map['project_id'] = $this->user['project_id'];
         $this->map['project_id'] = $this->user['project_id'];
         $lists = $customModuleContent->lists($this->map,$this->page,$this->row,$this->order = ['sort','id']);
         $lists = $customModuleContent->lists($this->map,$this->page,$this->row,$this->order = ['sort','id']);
         if(!empty($lists)){
         if(!empty($lists)){
+            $template_id = $this->getModuleTemplateId($this->param['module_id']);
             $data = $this->getAllCategoryName();
             $data = $this->getAllCategoryName();
             foreach ($lists['list'] as $k=>$v){
             foreach ($lists['list'] as $k=>$v){
                 $v['url'] = $this->getUrl($v);
                 $v['url'] = $this->getUrl($v);
                 $v = $this->getHandleImageFile($v);
                 $v = $this->getHandleImageFile($v);
                 $v['category_name'] = $this->categoryName($v['category_id'],$data);
                 $v['category_name'] = $this->categoryName($v['category_id'],$data);
                 $v['operator_name'] = (new User())->getName($v['operator_id']);
                 $v['operator_name'] = (new User())->getName($v['operator_id']);
+                $v['is_renovation']  =  $this->getIsRenovation($v['module_id'],BTemplate::IS_DETAIL,$template_id,$v['id'],BTemplate::IS_CUSTOM);
                 $lists['list'][$k] = $v;
                 $lists['list'][$k] = $v;
             }
             }
         }
         }
@@ -48,6 +53,25 @@ class CustomModuleContentController extends BaseController
     }
     }
 
 
     /**
     /**
+     * @remark :扩展模块获取模版id
+     * @name   :getTemplateId
+     * @author :lyh
+     * @method :post
+     * @time   :2024/1/31 16:47
+     */
+    public function getModuleTemplateId($module_id){
+        $template_id = 0;
+        $moduleModel = new CustomModule();
+        $info = $moduleModel->read(['id'=>$module_id]);
+        if($info['detail_customized'] != 1){
+            $bSettingModel = new Setting();
+            $info = $bSettingModel->read(['project_id'=>$this->user['project_id']]);
+            $template_id = $info['template_id'];
+        }
+        return $this->success($template_id);
+    }
+
+    /**
      * @remark :获取时处理视频，图片，文件
      * @remark :获取时处理视频，图片，文件
      * @name   :getHandleImageFile
      * @name   :getHandleImageFile
      * @author :lyh
      * @author :lyh