周海龙 / globalso · 提交

转到一个项目

作者 Your Name
提交 7a0eba4dea801f3428b3e5b94f51b7dd4f9a7f45 2 个父辈 3c869c1c 0b7250f7

Merge branch 'master' of http://47.244.231.31:8099/zhl/globalso-v6

内嵌 并排对比
正在显示 3 个修改的文件 包含 12 行增加 和 5 行删除
@@ -180,10 +180,11 @@ class ExtensionModuleController extends BaseController @@ -180,10 +180,11 @@ class ExtensionModuleController extends BaseController
180 'module_id.required' => '模块id不能为空', 180 'module_id.required' => '模块id不能为空',
181 ]); 181 ]);
182 $moduleValueModel = new ExtensionModuleValue(); 182 $moduleValueModel = new ExtensionModuleValue();
183 - $info = $moduleValueModel->where('module_id',$this->param['module_id'])->orderBy('uuid','desc')->first()->toArray(); 183 + $info = $moduleValueModel->where('module_id',$this->param['module_id'])->orderBy('uuid','desc')->first();
184 if(empty($info)){ 184 if(empty($info)){
185 $uuid = 1; 185 $uuid = 1;
186 }else{ 186 }else{
  187 + $info = $info->toArray();
187 $uuid = $info['uuid'] + 1; 188 $uuid = $info['uuid'] + 1;
188 } 189 }
189 $data = $this->param['data']; 190 $data = $this->param['data'];
@@ -139,8 +139,12 @@ class BTemplateLogLogic extends BaseLogic @@ -139,8 +139,12 @@ class BTemplateLogLogic extends BaseLogic
139 $param['html_style'] = null; 139 $param['html_style'] = null;
140 $typeSource = $this->getType($source,$is_list,$is_custom,$type,$template_id); 140 $typeSource = $this->getType($source,$is_list,$is_custom,$type,$template_id);
141 } 141 }
142 - //查看当前数据是否还存在  
143 - $condition = ['project_id'=>$this->user['project_id'],'template_id'=>$template_id,'is_list'=>$is_list,'is_custom'=>$is_custom,'source'=>$typeSource,'common_type'=>$type]; 142 + if($typeSource == 99){
  143 + $condition = ['project_id'=>$this->user['project_id'],'template_id'=>$template_id,'is_list'=>0,'is_custom'=>0,'source'=>$typeSource,'common_type'=>$type];
  144 + }else{
  145 + //查看当前数据是否还存在
  146 + $condition = ['project_id'=>$this->user['project_id'],'template_id'=>$template_id,'is_list'=>$is_list,'is_custom'=>$is_custom,'source'=>$typeSource,'common_type'=>$type];
  147 + }
144 $info = $templateComModel->read($condition); 148 $info = $templateComModel->read($condition);
145 if($info === false){ 149 if($info === false){
146 $data = array_merge($param,$condition); 150 $data = array_merge($param,$condition);
@@ -525,10 +525,12 @@ class BTemplateLogic extends BaseLogic @@ -525,10 +525,12 @@ class BTemplateLogic extends BaseLogic
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 if($typeSource == 99){ 527 if($typeSource == 99){
528 - $is_custom = $is_list = 0; 528 + $condition = ['project_id'=>$this->user['project_id'],'template_id'=>$template_id,'is_list'=>0,'is_custom'=>0,'source'=>$typeSource,'common_type'=>$type];
  529 + }else{
  530 + //查看当前数据是否还存在
  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];
529 } 532 }
530 //查看当前数据是否还存在 533 //查看当前数据是否还存在
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];  
532 $info = $templateComModel->read($condition); 534 $info = $templateComModel->read($condition);
533 if($info === false){ 535 if($info === false){
534 $data = array_merge($param,$condition); 536 $data = array_merge($param,$condition);