作者 李宇航

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

未续费项目增加搜索



查看合并请求 !2651
... ... @@ -6,7 +6,7 @@ use App\Enums\Common\Code;
use App\Http\Controllers\Aside\BaseController;
use App\Http\Logic\Aside\Template\ATemplateLogic;
use App\Http\Requests\Aside\Template\ATemplateRequest;
use App\Models\Manage\ManageHr;
use App\Models\Manage\Manage;
use App\Models\Template\TemplateLabel;
/**
... ... @@ -30,7 +30,7 @@ class ATemplateController extends BaseController
$filed = ['id','name','image','url','status','upload_id','sort','deleted_status','test_model','created_at','project_id'];
$lists = $aTemplateLogic->aTemplateList($this->map,$this->page,$this->row,$this->order,$filed);
if(!empty($lists) && !empty($lists['list'])){
$manageModel = new ManageHr();
$manageModel = new Manage();
foreach ($lists['list'] as $k => $v){
$v['label'] = $templateLabel->list(['template_id'=>$v['id'],'type'=>1],'id',['id','name'],'desc',5);
$v['image_link'] = getImageUrl($v['image']);
... ...