Commit 2f7c7d76 authored by 陈子龙's avatar 陈子龙

Merge branch 'dev-czl' into dev

parents 0f5e137c 372fb9c7
...@@ -603,7 +603,7 @@ func (h *HostManageSvc) ExportIp(id, uuid string, detectionType int) (fileName s ...@@ -603,7 +603,7 @@ func (h *HostManageSvc) ExportIp(id, uuid string, detectionType int) (fileName s
if detectionType == 1 { if detectionType == 1 {
//列表检测导出 //列表检测导出
finder := db.Table("host_manage_list").Where("is_delete = 0 AND host_group_id = ?", cast.ToInt(id)) finder := db.Table("host_manage_list").Where("is_delete = 0 AND host_group_id = ?", cast.ToInt(id))
err = finder.Select("").Find(&hostManageList) err = finder.Select("ip,port,voucher_type,user_name,password").Find(&hostManageList)
if err != nil { if err != nil {
err = resp.DbSelectError.WithError(err) err = resp.DbSelectError.WithError(err)
return return
...@@ -611,7 +611,7 @@ func (h *HostManageSvc) ExportIp(id, uuid string, detectionType int) (fileName s ...@@ -611,7 +611,7 @@ func (h *HostManageSvc) ExportIp(id, uuid string, detectionType int) (fileName s
} else { } else {
//新增/编辑检测导出 //新增/编辑检测导出
finder := db.Table("host_manage_list_cache").Where("id = ?", uuid) finder := db.Table("host_manage_list_cache").Where("id = ?", uuid)
err = finder.Select("").Find(&hostManageList) err = finder.Select("ip,port,voucher_type,user_name,password").Find(&hostManageList)
if err != nil { if err != nil {
err = resp.DbSelectError.WithError(err) err = resp.DbSelectError.WithError(err)
return return
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment