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

gx



查看合并请求 !609

@@ -11,6 +11,7 @@ namespace App\Http\Logic\Bside\BTemplate;
 
 
 use App\Http\Logic\Bside\BaseLogic;
 use App\Http\Logic\Bside\BaseLogic;
 use App\Models\Template\BModuleProject;
 use App\Models\Template\BModuleProject;
+use App\Models\Template\TemplateLabel;
 use App\Models\Template\TemplateModule;
 use App\Models\Template\TemplateModule;
 
 
 class BTemplateModuleProjectLogic extends BaseLogic
 class BTemplateModuleProjectLogic extends BaseLogic
@@ -33,6 +34,11 @@ class BTemplateModuleProjectLogic extends BaseLogic
         $map['deleted_status'] = 0;
         $map['deleted_status'] = 0;
         $map['project_id'] = $this->user['project_id'];
         $map['project_id'] = $this->user['project_id'];
         $lists = $this->model->list($map,$order,$filed);
         $lists = $this->model->list($map,$order,$filed);
+        $templateLabel = new TemplateLabel();
+        foreach ($lists as $k => $v){
+            $v['label'] = $templateLabel->list(['template_id'=>$v['id'],'type'=>2],'id',['id','name'],'desc');
+            $lists[$k] = $v;
+        }
         return $this->success($lists);
         return $this->success($lists);
     }
     }