|
...
|
...
|
@@ -12,7 +12,9 @@ namespace App\Http\Controllers\Bside\Template; |
|
|
|
use App\Enums\Common\Code;
|
|
|
|
use App\Http\Controllers\Bside\BaseController;
|
|
|
|
use App\Http\Logic\Bside\BTemplate\BTemplateLogLogic;
|
|
|
|
use App\Models\Template\BTemplate;
|
|
|
|
use App\Models\Template\BTemplateLog;
|
|
|
|
use App\Models\Template\Setting;
|
|
|
|
use App\Models\Template\Template;
|
|
|
|
use App\Models\User\User;
|
|
|
|
|
|
...
|
...
|
@@ -33,11 +35,8 @@ class BTemplateLogController extends BaseController |
|
|
|
* @time :2023/8/23 11:05
|
|
|
|
*/
|
|
|
|
public function lists(BTemplateLog $bTemplateLog){
|
|
|
|
// unset($this->map['template_id']);
|
|
|
|
|
|
|
|
$this->map['source'] = 1;
|
|
|
|
$this->map['is_custom'] = 0;
|
|
|
|
$lists = $bTemplateLog->lists($this->map,$this->page,$this->row,$this->order,['id','template_id','operator_id','source','created_at','updated_at']);
|
|
|
|
$field = ['id','template_id','operator_id','source','created_at','updated_at'];
|
|
|
|
$lists = $bTemplateLog->lists(['source'=>BTemplate::SOURCE_HOME,'is_custom'=>BTemplate::IS_NO_CUSTOM],$this->page,$this->row,$this->order,$field);
|
|
|
|
if(!empty($lists['list'])){
|
|
|
|
$templateModel = new Template();
|
|
|
|
$userModel = new User();
|
|
...
|
...
|
@@ -68,7 +67,12 @@ class BTemplateLogController extends BaseController |
|
|
|
'source_id.required' => '当前数据ID不能为空',
|
|
|
|
]);
|
|
|
|
$is_custom = $this->param['is_custom'] ?? 0;
|
|
|
|
$this->map = ['source'=>$this->param['source'],'source_id'=>$this->param['source_id'],'is_custom'=>$is_custom,'project_id'=>$this->user['project_id']];
|
|
|
|
$bSettingModel = new Setting();
|
|
|
|
$settingInfo = $bSettingModel->read(['project_id'=>$this->user['project_id']]);
|
|
|
|
if($settingInfo === false){
|
|
|
|
$this->response('请先选择模版',Code::SYSTEM_ERROR);
|
|
|
|
}
|
|
|
|
$this->map = ['source'=>$this->param['source'],'source_id'=>$this->param['source_id'],'is_custom'=>$is_custom,'template_id'=>$settingInfo['template_id']];
|
|
|
|
$lists = $bTemplateLog->lists($this->map,$this->page,$this->row,$this->order,['id','template_id','operator_id','source','created_at','updated_at']);
|
|
|
|
if(!empty($lists['list'])){
|
|
|
|
$templateModel = new Template();
|
...
|
...
|
|
