合并冲突

controllers/cloud_disk.go

@@ -1288,7 +1288,6 @@ func (this *CloudDiskController) Page() {
 	fmt.Printf("初始化查询参数耗时: %v\n", time.Since(startTime))
 	//等待完成建树
 	wg.Wait()
-	fmt.Println()
 	if len(menuIdList) > 0 {
 		if subMenu {
 			menuIdChan := make(chan []int, len(menuIdList))

models/cloud_disk_menu.go

@@ -1,9 +1,9 @@
 package models
 
 import (
-	"eta/eta_api/global"
 	"eta/eta_api/utils"
 	"fmt"
+	"eta/eta_api/global"
 	"strings"
 	"time"
 )

models/cloud_disk_resource.go

@@ -241,14 +241,14 @@ func BatchDeleteCloudDiskMenuAndResource(menuIds, resourceIds []int) (err error)
 
 func GetCloudDiskResourcePageCount(resourceCond string, resourcePars []interface{}) (total int, err error) {
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM cloud_disk_resource WHERE 1=1 %s `, resourceCond)
-	err = global.DEFAULT_DB.Raw(sql, resourcePars).Scan(&total).Error
-
+	err = global.DEFAULT_DB.Raw(sql, resourcePars...).Scan(&total).Error
 	return
 }
 func GetCloudDiskResourcePageList(resourceCond string, resourcePars []interface{}, orderRule string, startSize, pageSize int, menuNameMap map[int]string) (resourceList []*CloudDiskResourcePageItem, err error) {
 	sql := fmt.Sprintf(`SELECT resource_id , resource_name, resource_suffix, menu_id, size, admin_name, create_time FROM cloud_disk_resource WHERE 1=1 %s order by  %s LIMIT ?,?`, resourceCond, orderRule)
 	var ormList []*CloudDiskResource
-	err = global.DEFAULT_DB.Raw(sql, resourcePars, startSize, pageSize).Find(&ormList).Error
+	resourcePars = append(resourcePars, startSize, pageSize)
+	err = global.DEFAULT_DB.Raw(sql, resourcePars...).Find(&ormList).Error
 	if err != nil {
 		return
 	}