作者 李宇航

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

gx暂停计时



查看合并请求 !1957
... ... @@ -31,8 +31,7 @@ class BTemplateModuleProjectLogic extends BaseLogic
*/
public function ModuleList($map,$order = 'created_at',$filed = ['id','name','status','image','html','project_id']){
$map['deleted_status'] = 0;
$map['project_id'] = $this->user['project_id'];
$list = $this->model->list($map,$order,$filed);
$list = $this->model::whereRaw("FIND_IN_SET(?, project_id)", [$this->user['project_id']])->get()->toArray();
$templateLabel = new TemplateLabel();
$label = [];
foreach ($list as $v){
... ...