合并分支 'lyh-server' 到 'master'

gx



查看合并请求 !2609

@@ -25,7 +25,7 @@ class ATemplateController extends BaseController
      */
      */
     public function lists(ATemplateLogic $aTemplateLogic){
     public function lists(ATemplateLogic $aTemplateLogic){
         $templateLabel = new TemplateLabel();
         $templateLabel = new TemplateLabel();
-        $this->searchLabelName($templateLabel);
+        $this->map = $this->searchLabelName($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'])){
@@ -51,7 +51,7 @@ class ATemplateController extends BaseController
             $this->map['id'] = ['in',$id_arr];
             $this->map['id'] = ['in',$id_arr];
             unset($this->map['label_name']);
             unset($this->map['label_name']);
         }
         }
-        return true;
+        return $this->map;
     }
     }
 
 
     /**
     /**

@@ -28,7 +28,7 @@ class ATemplateModuleController extends BaseController
     public function lists(TemplateModule $templateModule){
     public function lists(TemplateModule $templateModule){
         $templateLabel = new TemplateLabel();
         $templateLabel = new TemplateLabel();
         $this->map['deleted_status'] = 0;
         $this->map['deleted_status'] = 0;
-        $this->searchLabelName($templateLabel);
+        $this->map = $this->searchLabelName($templateLabel);
         $lists = $templateModule->lists($this->map,$this->page,$this->row,$this->order);
         $lists = $templateModule->lists($this->map,$this->page,$this->row,$this->order);
         if(!empty($lists) && !empty($lists['list'])){
         if(!empty($lists) && !empty($lists['list'])){
             foreach ($lists['list'] as $k => $v){
             foreach ($lists['list'] as $k => $v){
@@ -52,7 +52,7 @@ class ATemplateModuleController extends BaseController
             $this->map['id'] = ['in',$id_arr];
             $this->map['id'] = ['in',$id_arr];
             unset($this->map['label_name']);
             unset($this->map['label_name']);
         }
         }
-        return true;
+        return $this->map;
     }
     }