|
@@ -66,6 +66,13 @@ class ServersIpController extends BaseController |
|
@@ -66,6 +66,13 @@ class ServersIpController extends BaseController |
|
66
|
$serversIpModel = new ServersIpModel();
|
66
|
$serversIpModel = new ServersIpModel();
|
|
67
|
$this->map['status'] = 0;
|
67
|
$this->map['status'] = 0;
|
|
68
|
$data = $serversIpModel->lists($this->map,$this->page,$this->row,$this->order);
|
68
|
$data = $serversIpModel->lists($this->map,$this->page,$this->row,$this->order);
|
|
|
|
69
|
+ if(!empty($data) && !empty($data['list'])){
|
|
|
|
70
|
+ $projectModel = new Project();
|
|
|
|
71
|
+ foreach ($data['list'] as $k => $v){
|
|
|
|
72
|
+ $v['project_title'] = $projectModel->formatQuery(['serve_id'=>$v['id']])->pluck('title')->toArray();
|
|
|
|
73
|
+ $data['list'][$k] = $v;
|
|
|
|
74
|
+ }
|
|
|
|
75
|
+ }
|
|
69
|
$this->response('success',Code::SUCCESS,$data);
|
76
|
$this->response('success',Code::SUCCESS,$data);
|
|
70
|
}
|
77
|
}
|
|
71
|
|
78
|
|
|
@@ -158,7 +165,7 @@ class ServersIpController extends BaseController |
|
@@ -158,7 +165,7 @@ class ServersIpController extends BaseController |
|
158
|
]);
|
165
|
]);
|
|
159
|
$serverModel = new Servers();
|
166
|
$serverModel = new Servers();
|
|
160
|
$info = $serverModel->read(['id'=>$this->map['servers_id']]);
|
167
|
$info = $serverModel->read(['id'=>$this->map['servers_id']]);
|
|
161
|
- $data[] = [];
|
168
|
+ $data = [];
|
|
162
|
$serversIpModel = new ServersIpModel();
|
169
|
$serversIpModel = new ServersIpModel();
|
|
163
|
$list = $serversIpModel->list($this->map);
|
170
|
$list = $serversIpModel->list($this->map);
|
|
164
|
foreach ($list as $v){
|
171
|
foreach ($list as $v){
|