作者 lyh

gx

@@ -25,7 +25,7 @@ class ATemplateController extends BaseController @@ -25,7 +25,7 @@ class ATemplateController extends BaseController
25 */ 25 */
26 public function lists(ATemplateLogic $aTemplateLogic){ 26 public function lists(ATemplateLogic $aTemplateLogic){
27 $templateLabel = new TemplateLabel(); 27 $templateLabel = new TemplateLabel();
28 - $this->searchLabelName($templateLabel); 28 + $this->map = $this->searchLabelName($templateLabel);
29 $filed = ['id','name','image','url','status','sort','deleted_status','test_model','created_at','project_id']; 29 $filed = ['id','name','image','url','status','sort','deleted_status','test_model','created_at','project_id'];
30 $lists = $aTemplateLogic->aTemplateList($this->map,$this->page,$this->row,$this->order,$filed); 30 $lists = $aTemplateLogic->aTemplateList($this->map,$this->page,$this->row,$this->order,$filed);
31 if(!empty($lists) && !empty($lists['list'])){ 31 if(!empty($lists) && !empty($lists['list'])){
@@ -51,7 +51,7 @@ class ATemplateController extends BaseController @@ -51,7 +51,7 @@ class ATemplateController extends BaseController
51 $this->map['id'] = ['in',$id_arr]; 51 $this->map['id'] = ['in',$id_arr];
52 unset($this->map['label_name']); 52 unset($this->map['label_name']);
53 } 53 }
54 - return true; 54 + return $this->map;
55 } 55 }
56 56
57 /** 57 /**
@@ -28,7 +28,7 @@ class ATemplateModuleController extends BaseController @@ -28,7 +28,7 @@ class ATemplateModuleController extends BaseController
28 public function lists(TemplateModule $templateModule){ 28 public function lists(TemplateModule $templateModule){
29 $templateLabel = new TemplateLabel(); 29 $templateLabel = new TemplateLabel();
30 $this->map['deleted_status'] = 0; 30 $this->map['deleted_status'] = 0;
31 - $this->searchLabelName($templateLabel); 31 + $this->map = $this->searchLabelName($templateLabel);
32 $lists = $templateModule->lists($this->map,$this->page,$this->row,$this->order); 32 $lists = $templateModule->lists($this->map,$this->page,$this->row,$this->order);
33 if(!empty($lists) && !empty($lists['list'])){ 33 if(!empty($lists) && !empty($lists['list'])){
34 foreach ($lists['list'] as $k => $v){ 34 foreach ($lists['list'] as $k => $v){
@@ -52,7 +52,7 @@ class ATemplateModuleController extends BaseController @@ -52,7 +52,7 @@ class ATemplateModuleController extends BaseController
52 $this->map['id'] = ['in',$id_arr]; 52 $this->map['id'] = ['in',$id_arr];
53 unset($this->map['label_name']); 53 unset($this->map['label_name']);
54 } 54 }
55 - return true; 55 + return $this->map;
56 } 56 }
57 57
58 58