gx脚本demo

@@ -180,10 +180,11 @@ class ExtensionModuleController extends BaseController
             'module_id.required' => '模块id不能为空',
         ]);
         $moduleValueModel = new ExtensionModuleValue();
-        $info = $moduleValueModel->where('module_id',$this->param['module_id'])->orderBy('uuid','desc')->first()->toArray();
+        $info = $moduleValueModel->where('module_id',$this->param['module_id'])->orderBy('uuid','desc')->first();
         if(empty($info)){
             $uuid = 1;
         }else{
+            $info = $info->toArray();
             $uuid = $info['uuid'] + 1;
         }
         $data = $this->param['data'];

@@ -525,10 +525,12 @@ class BTemplateLogic extends BaseLogic
                 $typeSource = $this->getType($source,$is_list,$is_custom,BTemplate::COMMON_HEAD,$template_id);
             }
             if($typeSource == 99){
-                $is_custom = $is_list = 0;
-            }
+                $condition = ['project_id'=>$this->user['project_id'],'template_id'=>$template_id,'is_list'=>0,'is_custom'=>0,'source'=>$typeSource,'common_type'=>$type];
+            }else{
                 //查看当前数据是否还存在
                 $condition = ['project_id'=>$this->user['project_id'],'template_id'=>$template_id,'is_list'=>$is_list,'is_custom'=>$is_custom,'source'=>$typeSource,'common_type'=>$type];
+            }
+            //查看当前数据是否还存在
             $info = $templateComModel->read($condition);
             if($info === false){
                 $data = array_merge($param,$condition);