|
@@ -8,6 +8,7 @@ use App\Http\Logic\Aside\Template\ATemplateLogic; |
|
@@ -8,6 +8,7 @@ use App\Http\Logic\Aside\Template\ATemplateLogic; |
|
8
|
use App\Http\Logic\Aside\Template\ATemplateModuleLogic;
|
8
|
use App\Http\Logic\Aside\Template\ATemplateModuleLogic;
|
|
9
|
use App\Http\Requests\Aside\Template\ATemplateModuleRequest;
|
9
|
use App\Http\Requests\Aside\Template\ATemplateModuleRequest;
|
|
10
|
use App\Models\Project\Project;
|
10
|
use App\Models\Project\Project;
|
|
|
|
11
|
+use App\Models\Template\TemplateLabel;
|
|
11
|
|
12
|
|
|
12
|
/**
|
13
|
/**
|
|
13
|
* @remark :左侧模块管理
|
14
|
* @remark :左侧模块管理
|
|
@@ -25,11 +26,37 @@ class ATemplateModuleController extends BaseController |
|
@@ -25,11 +26,37 @@ class ATemplateModuleController extends BaseController |
|
25
|
* @time :2023/6/28 16:54
|
26
|
* @time :2023/6/28 16:54
|
|
26
|
*/
|
27
|
*/
|
|
27
|
public function lists(ATemplateModuleLogic $ATemplateModuleLogic){
|
28
|
public function lists(ATemplateModuleLogic $ATemplateModuleLogic){
|
|
28
|
- $lists = $ATemplateModuleLogic->aTemplateModuleLists($this->map,$this->page,$this->row,$this->order);
|
29
|
+ $templateLabel = new TemplateLabel();
|
|
|
|
30
|
+ $this->map['deleted_status'] = 0;
|
|
|
|
31
|
+ $this->searchLabelName($templateLabel);
|
|
|
|
32
|
+ $lists = $ATemplateModuleLogic->lists($this->map,$this->page,$this->row,$this->order);
|
|
|
|
33
|
+ if(!empty($lists) && !empty($lists['list'])){
|
|
|
|
34
|
+ foreach ($lists['list'] as $k => $v){
|
|
|
|
35
|
+ $v['label'] = $templateLabel->list(['template_id'=>$v['id'],'type'=>2],'id',['id','name'],'desc',5);
|
|
|
|
36
|
+ $lists['list'][$k] = $v;
|
|
|
|
37
|
+ }
|
|
|
|
38
|
+ }
|
|
29
|
$this->response('success',Code::SUCCESS,$lists);
|
39
|
$this->response('success',Code::SUCCESS,$lists);
|
|
30
|
}
|
40
|
}
|
|
31
|
|
41
|
|
|
32
|
/**
|
42
|
/**
|
|
|
|
43
|
+ * @remark :搜索label
|
|
|
|
44
|
+ * @name :searchLabelName
|
|
|
|
45
|
+ * @author :lyh
|
|
|
|
46
|
+ * @method :post
|
|
|
|
47
|
+ * @time :2024/6/3 11:11
|
|
|
|
48
|
+ */
|
|
|
|
49
|
+ public function searchLabelName($templateLabel){
|
|
|
|
50
|
+ if(isset($this->map['label_name']) && !empty($this->map['label_name'])){
|
|
|
|
51
|
+ $id_arr = $templateLabel->formatQuery(['name'=>['like','%'.$this->map['label_name'].'%'],'type'=>2])->pluck('template_id')->toArray();
|
|
|
|
52
|
+ $this->map['id'] = ['in',$id_arr];
|
|
|
|
53
|
+ unset($this->map['label_name']);
|
|
|
|
54
|
+ }
|
|
|
|
55
|
+ return true;
|
|
|
|
56
|
+ }
|
|
|
|
57
|
+
|
|
|
|
58
|
+
|
|
|
|
59
|
+ /**
|
|
33
|
* @remark :左侧模块保存
|
60
|
* @remark :左侧模块保存
|
|
34
|
* @name :save
|
61
|
* @name :save
|
|
35
|
* @author :lyh
|
62
|
* @author :lyh
|
