作者 张关杰

Merge branch 'lyh_edit' of http://47.244.231.31:8099/zhl/globalso-v6 into bate

... ... @@ -14,6 +14,8 @@ use App\Http\Controllers\Aside\BaseController;
use App\Http\Logic\Aside\Template\ReplaceHtmlLogic;
use App\Models\Template\TemplateReplaceHtml;
use App\Models\Template\TemplateReplaceHtmlLog;
use App\Services\ProjectServer;
use Illuminate\Support\Facades\DB;
class ReplaceHtmlController extends BaseController
{
... ... @@ -52,7 +54,21 @@ class ReplaceHtmlController extends BaseController
* @time :2024/5/8 10:28
*/
public function replaceTemplateLog(TemplateReplaceHtml $replaceModel){
$this->request->validate([
'project_id'=>'required',
],[
'project_id.required' => 'project_id不能为空',
]);
ProjectServer::useProject($this->param['project_id']);
$lists = $replaceModel->lists($this->map,$this->page,$this->row,$this->order);
if(!empty($lists) && !empty($lists['list'])){
$templateLogModel = new TemplateReplaceHtmlLog();
foreach ($lists['list'] as $k => $v){
$v['sub'] = $templateLogModel->list(['replace_id'=>$v['id']]);
$lists['list'][$k] = $v;
}
}
DB::disconnect('custom_mysql');
$this->response('success',Code::SUCCESS,$lists);
}
... ...