Merge branch 'zenops_46_tanghucheng' of https://gitlab.zcorp.cc/easycorp/zentaopms into zenops_46_tanghucheng
This commit is contained in:
@@ -402,7 +402,7 @@ class zanodemodel extends model
|
||||
*/
|
||||
public function getListByHost($hostID, $orderBy = 'id_desc')
|
||||
{
|
||||
$list = $this->dao->select('id, name, vnc, cpuCores, memory, diskSize, osName, status')->from(TABLE_ZAHOST)
|
||||
$list = $this->dao->select('id, name, vnc, cpuCores, memory, diskSize, osName, status, heartbeat')->from(TABLE_ZAHOST)
|
||||
->where('deleted')->eq(0)
|
||||
->andWhere("parent")->eq($hostID)
|
||||
->orderBy($orderBy)
|
||||
|
||||
Reference in New Issue
Block a user