gx

@@ -8,6 +8,7 @@ use App\Http\Logic\Aside\Template\ATemplateLogic;
 use App\Http\Requests\Aside\Template\ATemplateRequest;
 use App\Http\Requests\Aside\Template\ATemplateRequest;
 use App\Models\Template\Setting;
 use App\Models\Template\Setting;
 use App\Models\Template\Template;
 use App\Models\Template\Template;
+use App\Models\Template\TemplateLabel;
 
 
 /**
 /**
  * @remark :A端主题模板管理
  * @remark :A端主题模板管理
@@ -24,11 +25,12 @@ class ATemplateController extends BaseController
      * @method :post
      * @method :post
      * @time   :2023/6/28 16:34
      * @time   :2023/6/28 16:34
      */
      */
-    public function lists(ATemplateLogic $aTemplateLogic){
+    public function lists(ATemplateLogic $aTemplateLogic,TemplateLabel $templateLabel){
         $filed = ['id','name','image','url','status','sort','deleted_status','test_model','created_at','project_id'];
         $filed = ['id','name','image','url','status','sort','deleted_status','test_model','created_at','project_id'];
         $lists = $aTemplateLogic->aTemplateList($this->map,$this->page,$this->row,$this->order,$filed);
         $lists = $aTemplateLogic->aTemplateList($this->map,$this->page,$this->row,$this->order,$filed);
         if(!empty($lists) && !empty($lists['list'])){
         if(!empty($lists) && !empty($lists['list'])){
             foreach ($lists['list'] as $k => $v){
             foreach ($lists['list'] as $k => $v){
+                $v['label'] = $templateLabel->list(['template_id'=>$v['id']],'id',['id','name'],'desc',5);
                 $v['image_link'] = getImageUrl($v['image']);
                 $v['image_link'] = getImageUrl($v['image']);
                 $lists['list'][$k] = $v;
                 $lists['list'][$k] = $v;
             }
             }

@@ -37,7 +37,6 @@ class TemplateLabelController extends BaseController
         ],[
         ],[
             'template_id.required' => '模版id不能为空',
             'template_id.required' => '模版id不能为空',
         ]);
         ]);
-        $this->map['manager_id'] = $this->manage['id'];
         $data = $templateLabel->list($this->map);
         $data = $templateLabel->list($this->map);
         $this->response('success',Code::SUCCESS,$data);
         $this->response('success',Code::SUCCESS,$data);
     }
     }

@@ -40,16 +40,20 @@ class TemplateLabelLogic extends BaseLogic
      * @time   :2024/5/16 9:55
      * @time   :2024/5/16 9:55
      */
      */
     public function saveLabel(){
     public function saveLabel(){
-        try {
         if(isset($this->param['id']) && !empty($this->param['id'])){
         if(isset($this->param['id']) && !empty($this->param['id'])){
             $id = $this->param['id'];
             $id = $this->param['id'];
+            $info = $this->model->read(['name'=>$this->param['name'],['template_id'=>$this->param['template_id']],'id'=>['!=',$id]],['id']);
+            if($info === false){
                 $this->model->edit($this->param,['id'=>$id]);
                 $this->model->edit($this->param,['id'=>$id]);
+            }
         }else{
         }else{
+            $info = $this->model->read(['name'=>$this->param['name'],['template_id'=>$this->param['template_id']]],['id']);
+            if($info === false){
                 $this->param['manager_id'] = $this->manager['id'];
                 $this->param['manager_id'] = $this->manager['id'];
                 $id = $this->model->addReturnId($this->param);
                 $id = $this->model->addReturnId($this->param);
+            }else{
+                $id = $info['id'];
             }
             }
-        }catch (\Exception $e){
-            $this->fail('保存失败，请联系管理员');
         }
         }
         return $this->success(['id'=>$id]);
         return $this->success(['id'=>$id]);
     }
     }