|
@@ -524,10 +524,11 @@ class BTemplateLogic extends BaseLogic |
|
@@ -524,10 +524,11 @@ class BTemplateLogic extends BaseLogic |
|
524
|
$param['html_style'] = null;
|
524
|
$param['html_style'] = null;
|
|
525
|
$typeSource = $this->getType($source,$is_list,$is_custom,BTemplate::COMMON_HEAD,$template_id);
|
525
|
$typeSource = $this->getType($source,$is_list,$is_custom,BTemplate::COMMON_HEAD,$template_id);
|
|
526
|
}
|
526
|
}
|
|
527
|
- $list_is = $is_list;
|
|
|
|
528
|
- ($typeSource == 99) ? $list_is = 0 : $list_is;
|
527
|
+ if($typeSource == 99){
|
|
|
|
528
|
+ $is_custom = $is_list = 0;
|
|
|
|
529
|
+ }
|
|
529
|
//查看当前数据是否还存在
|
530
|
//查看当前数据是否还存在
|
|
530
|
- $condition = ['project_id'=>$this->user['project_id'],'template_id'=>$template_id,'is_list'=>$list_is,'is_custom'=>$is_custom,'source'=>$typeSource,'common_type'=>$type];
|
531
|
+ $condition = ['project_id'=>$this->user['project_id'],'template_id'=>$template_id,'is_list'=>$is_list,'is_custom'=>$is_custom,'source'=>$typeSource,'common_type'=>$type];
|
|
531
|
$info = $templateComModel->read($condition);
|
532
|
$info = $templateComModel->read($condition);
|
|
532
|
if($info === false){
|
533
|
if($info === false){
|
|
533
|
$data = array_merge($param,$condition);
|
534
|
$data = array_merge($param,$condition);
|
