正在显示
1 个修改的文件
包含
5 行增加
和
3 行删除
| @@ -19,6 +19,7 @@ use App\Models\Template\BTemplateCom; | @@ -19,6 +19,7 @@ use App\Models\Template\BTemplateCom; | ||
| 19 | use App\Models\Template\BTemplateMain; | 19 | use App\Models\Template\BTemplateMain; |
| 20 | use App\Models\Template\Setting; | 20 | use App\Models\Template\Setting; |
| 21 | use App\Models\Template\TemplateTypeMain; | 21 | use App\Models\Template\TemplateTypeMain; |
| 22 | +use function Qcloud\Cos\encodeKey; | ||
| 22 | 23 | ||
| 23 | class InitHtmlLogic extends BaseLogic | 24 | class InitHtmlLogic extends BaseLogic |
| 24 | { | 25 | { |
| @@ -214,10 +215,11 @@ class InitHtmlLogic extends BaseLogic | @@ -214,10 +215,11 @@ class InitHtmlLogic extends BaseLogic | ||
| 214 | $typeSource = $this->getType($source,$is_list,$is_custom,BTemplate::COMMON_HEAD,$template_id); | 215 | $typeSource = $this->getType($source,$is_list,$is_custom,BTemplate::COMMON_HEAD,$template_id); |
| 215 | } | 216 | } |
| 216 | if($typeSource == 99){ | 217 | if($typeSource == 99){ |
| 217 | - $is_custom = $is_list = 0; | 218 | + $condition = ['project_id'=>$this->user['project_id'],'template_id'=>$template_id,'is_list'=>0,'is_custom'=>0,'source'=>$typeSource,'common_type'=>$type]; |
| 219 | + }else{ | ||
| 220 | + //查看当前数据是否还存在 | ||
| 221 | + $condition = ['project_id'=>$this->user['project_id'],'template_id'=>$template_id,'is_list'=>$is_list,'is_custom'=>$is_custom,'source'=>$typeSource,'common_type'=>$type]; | ||
| 218 | } | 222 | } |
| 219 | - //查看当前数据是否还存在 | ||
| 220 | - $condition = ['project_id'=>$this->user['project_id'],'template_id'=>$template_id,'is_list'=>$is_list,'is_custom'=>$is_custom,'source'=>$typeSource,'common_type'=>$type]; | ||
| 221 | $info = $templateComModel->read($condition); | 223 | $info = $templateComModel->read($condition); |
| 222 | if($info === false){ | 224 | if($info === false){ |
| 223 | $data = array_merge($param,$condition); | 225 | $data = array_merge($param,$condition); |
-
请 注册 或 登录 后发表评论