正在显示
1 个修改的文件
包含
2 行增加
和
2 行删除
| @@ -13,6 +13,7 @@ use App\Enums\Common\Code; | @@ -13,6 +13,7 @@ use App\Enums\Common\Code; | ||
| 13 | use App\Http\Controllers\Aside\BaseController; | 13 | use App\Http\Controllers\Aside\BaseController; |
| 14 | use App\Http\Logic\Aside\Template\ReplaceHtmlLogic; | 14 | use App\Http\Logic\Aside\Template\ReplaceHtmlLogic; |
| 15 | use App\Models\Manage\Manage; | 15 | use App\Models\Manage\Manage; |
| 16 | +use App\Models\Project\Project; | ||
| 16 | use App\Models\Template\TemplateReplaceHtml; | 17 | use App\Models\Template\TemplateReplaceHtml; |
| 17 | use App\Models\Template\TemplateReplaceHtmlLog; | 18 | use App\Models\Template\TemplateReplaceHtmlLog; |
| 18 | 19 | ||
| @@ -68,8 +69,7 @@ class ReplaceHtmlController extends BaseController | @@ -68,8 +69,7 @@ class ReplaceHtmlController extends BaseController | ||
| 68 | $lists = $replaceModel->lists($this->map,$this->page,$this->row,$this->order); | 69 | $lists = $replaceModel->lists($this->map,$this->page,$this->row,$this->order); |
| 69 | if(!empty($lists) && !empty($lists['list'])){ | 70 | if(!empty($lists) && !empty($lists['list'])){ |
| 70 | foreach ($lists['list'] as $k => $v){ | 71 | foreach ($lists['list'] as $k => $v){ |
| 71 | - $templateLogModel = new TemplateReplaceHtmlLog(); | ||
| 72 | - $v['sub'] = $templateLogModel->list(['replace_id'=>$v['id']]); | 72 | + $v['project_name'] = (new Project())->getProjectName($v['project_id']); |
| 73 | $v['operator_name'] = (new Manage())->getName($v['operator_id']); | 73 | $v['operator_name'] = (new Manage())->getName($v['operator_id']); |
| 74 | $v['source_name'] = $logic->getSourceName($v['source'],$v['is_list'],$v['is_custom'],$v['project_id']); | 74 | $v['source_name'] = $logic->getSourceName($v['source'],$v['is_list'],$v['is_custom'],$v['project_id']); |
| 75 | $lists['list'][$k] = $v; | 75 | $lists['list'][$k] = $v; |
-
请 注册 或 登录 后发表评论