作者 lyh

gx

@@ -31,7 +31,7 @@ class ReplaceHtmlController extends BaseController @@ -31,7 +31,7 @@ class ReplaceHtmlController extends BaseController
31 ],[ 31 ],[
32 'project_id.required' => 'project_id不能为空', 32 'project_id.required' => 'project_id不能为空',
33 ]); 33 ]);
34 - $data = $logic->sourceTypeInfo(); 34 + $data = $logic->sourceTypeInfo($this->param['project_id']);
35 $this->response('success',Code::SUCCESS,$data); 35 $this->response('success',Code::SUCCESS,$data);
36 } 36 }
37 /** 37 /**
@@ -71,7 +71,7 @@ class ReplaceHtmlController extends BaseController @@ -71,7 +71,7 @@ class ReplaceHtmlController extends BaseController
71 $templateLogModel = new TemplateReplaceHtmlLog(); 71 $templateLogModel = new TemplateReplaceHtmlLog();
72 $v['sub'] = $templateLogModel->list(['replace_id'=>$v['id']]); 72 $v['sub'] = $templateLogModel->list(['replace_id'=>$v['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']); 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;
76 } 76 }
77 } 77 }
@@ -123,7 +123,7 @@ class ReplaceHtmlLogic extends BaseLogic @@ -123,7 +123,7 @@ class ReplaceHtmlLogic extends BaseLogic
123 * @time :2024/5/7 15:52 123 * @time :2024/5/7 15:52
124 */ 124 */
125 public function replaceTemplateMainHtml(){ 125 public function replaceTemplateMainHtml(){
126 - $data = $this->sourceTypeInfo(); 126 + $data = $this->sourceTypeInfo($this->param['project_id']);
127 $typeInfo = $data[$this->param['name']]; 127 $typeInfo = $data[$this->param['name']];
128 ProjectServer::useProject($this->param['project_id']); 128 ProjectServer::useProject($this->param['project_id']);
129 $bTemplateModel = new BTemplate(); 129 $bTemplateModel = new BTemplate();
@@ -183,7 +183,7 @@ class ReplaceHtmlLogic extends BaseLogic @@ -183,7 +183,7 @@ class ReplaceHtmlLogic extends BaseLogic
183 $this->fail('当前数据不存在'); 183 $this->fail('当前数据不存在');
184 } 184 }
185 if($info['source'] == 0){//当前数据是替换的所有页面 185 if($info['source'] == 0){//当前数据是替换的所有页面
186 - $data = $this->sourceTypeInfo(); 186 + $data = $this->sourceTypeInfo($info['project_id']);
187 $typeInfo = $data[$this->param['name']]; 187 $typeInfo = $data[$this->param['name']];
188 if($typeInfo['source'] != 0){//回滚页面 188 if($typeInfo['source'] != 0){//回滚页面
189 $info['source'] = $typeInfo['source']; 189 $info['source'] = $typeInfo['source'];
@@ -228,9 +228,9 @@ class ReplaceHtmlLogic extends BaseLogic @@ -228,9 +228,9 @@ class ReplaceHtmlLogic extends BaseLogic
228 * @method :post 228 * @method :post
229 * @time :2024/5/9 17:15 229 * @time :2024/5/9 17:15
230 */ 230 */
231 - public function sourceTypeInfo(){ 231 + public function sourceTypeInfo($project_id){
232 $data = $this->model->sourceType(); 232 $data = $this->model->sourceType();
233 - ProjectServer::useProject($this->param['project_id']); 233 + ProjectServer::useProject($project_id);
234 $customModule = new CustomModule(); 234 $customModule = new CustomModule();
235 $moduleList = $customModule->list(['project_id'=>$this->param['project_id']],'id',['id','name']); 235 $moduleList = $customModule->list(['project_id'=>$this->param['project_id']],'id',['id','name']);
236 foreach ($moduleList as $value){ 236 foreach ($moduleList as $value){
@@ -248,9 +248,9 @@ class ReplaceHtmlLogic extends BaseLogic @@ -248,9 +248,9 @@ class ReplaceHtmlLogic extends BaseLogic
248 * @method :post 248 * @method :post
249 * @time :2024/5/10 16:55 249 * @time :2024/5/10 16:55
250 */ 250 */
251 - public function getSourceName($source,$is_list,$is_custom){ 251 + public function getSourceName($source,$is_list,$is_custom,$project_id){
252 $arr = ['source'=>$source,'is_list'=>$is_list,'is_custom'=>$is_custom]; 252 $arr = ['source'=>$source,'is_list'=>$is_list,'is_custom'=>$is_custom];
253 - $data = $this->sourceTypeInfo(); 253 + $data = $this->sourceTypeInfo($project_id);
254 foreach ($data as $k => $v){ 254 foreach ($data as $k => $v){
255 if($v == $arr){ 255 if($v == $arr){
256 return $this->success($k); 256 return $this->success($k);