|
@@ -118,13 +118,20 @@ class RenewProjectController extends BaseController |
|
@@ -118,13 +118,20 @@ class RenewProjectController extends BaseController |
|
118
|
if(!empty($this->map['title'])){
|
118
|
if(!empty($this->map['title'])){
|
|
119
|
$this->map['title'] = ['like', '%'.$this->map['title'].'%'];
|
119
|
$this->map['title'] = ['like', '%'.$this->map['title'].'%'];
|
|
120
|
}
|
120
|
}
|
|
|
|
121
|
+ $domainModel = new DomainInfo();
|
|
|
|
122
|
+ if(!empty($this->map['domain'])){
|
|
|
|
123
|
+ $parsedUrl = parse_url($this->map['domain']);
|
|
|
|
124
|
+ $search_domain = $parsedUrl['host'] ?? $this->map['domain'];
|
|
|
|
125
|
+ $ids = $domainModel->selectField(['domain'=>['like','%'.$search_domain.'%']],'id');
|
|
|
|
126
|
+ $this->map['domain'] = ['in',$ids];
|
|
|
|
127
|
+ }
|
|
121
|
$lists = $project->formatQuery($this->map)->with('payment')->with('deploy_build')
|
128
|
$lists = $project->formatQuery($this->map)->with('payment')->with('deploy_build')
|
|
122
|
->with('deploy_optimize')->with('online_check')
|
129
|
->with('deploy_optimize')->with('online_check')
|
|
123
|
->with('project_after')->paginate($this->row, ['*'], 'page', $this->page);
|
130
|
->with('project_after')->paginate($this->row, ['*'], 'page', $this->page);
|
|
124
|
if(!empty($lists)){
|
131
|
if(!empty($lists)){
|
|
125
|
$lists = $lists->toArray();
|
132
|
$lists = $lists->toArray();
|
|
126
|
$manageModel = new ManageHr();
|
133
|
$manageModel = new ManageHr();
|
|
127
|
- $domainModel = new DomainInfo();
|
134
|
+
|
|
128
|
foreach ($lists['list'] as $k=>$item){
|
135
|
foreach ($lists['list'] as $k=>$item){
|
|
129
|
$item = $this->handleParam($item,$manageModel,$domainModel);
|
136
|
$item = $this->handleParam($item,$manageModel,$domainModel);
|
|
130
|
$lists['list'][$k] = $item;
|
137
|
$lists['list'][$k] = $item;
|
