fix bug

models/data_manage/chart_classify.go

@@ -179,7 +179,7 @@ type ChartClassifyItems struct {
 	SeasonStartDate     string                   `description:"季节性图开始日期"`
 	SeasonEndDate       string                   `description:"季节性图开始日期"`
 	Children            []*ChartClassifyItems    `gorm:"-"`
-	Button              ChartClassifyItemsButton `description:"按钮权限"`
+	Button              ChartClassifyItemsButton `gorm:"-" description:"按钮权限"`
 	IsJoinPermission    int                      `description:"是否加入权限管控，0：不加入；1：加入；默认：0"`
 	HaveOperaAuth       bool                     `description:"是否有数据权限，默认：false"`
 }

models/data_manage/edb_info.go

@@ -1603,7 +1603,8 @@ func GetEdbBaseInfoList(condition string, pars []interface{}, orderBy string, st
 	if condition != "" {
 		totalSql += condition
 	}
-	err = o.Raw(totalSql, pars).Scan(&total).Error
+
+	err = o.Raw(totalSql, pars...).Scan(&total).Error
 	if err != nil {
 		return
 	}
@@ -1620,6 +1621,7 @@ func GetEdbBaseInfoList(condition string, pars []interface{}, orderBy string, st
 		sql += ` ORDER BY edb_info_id ASC `
 	}
 	sql += `  LIMIT ?,? `
+
 	err = o.Raw(sql, pars...).Scan(&items).Error
 
 	return

models/data_manage/mysteel_chemical_index.go

@@ -206,20 +206,20 @@ func GetMysteelChemicalFrequency(condition string, pars []interface{}) (items []
 
 // MysteelChemicalList 钢联化工指标列表
 type MysteelChemicalList struct {
-	Id                                int                `orm:"column(base_from_mysteel_chemical_index_id)"`
-	BaseFromMysteelChemicalClassifyId int                `orm:"column(base_from_mysteel_chemical_classify_id)" description:"钢联化工指标分类id"`
-	ParentClassifyId                  int                `description:"钢联化工指标父级分类id"`
-	IndexCode                         string             `description:"指标编码"`
-	IndexName                         string             `description:"指标名称"`
-	UnitName                          string             `orm:"column(unit)"`
-	UniqueCode                        string             `description:"唯一编码"`
-	FrequencyName                     string             `orm:"column(frequency)"`
-	EdbInfoId                         int                `description:"指标库的id"`
-	UpdateTime                        string             `orm:"column(modify_time)"`
-	IsStop                            int                `description:"是否停更:1:停更,0:未停更"`
-	IsSupplierStop                    int                `description:"是否供应商停更:1:停更,0:未停更"`
-	Paging                            *paging.PagingItem `description:"分页数据"`
-	DataList                          []*MysteelChemicalData
+	Id                                int                    `orm:"column(base_from_mysteel_chemical_index_id)"`
+	BaseFromMysteelChemicalClassifyId int                    `orm:"column(base_from_mysteel_chemical_classify_id)" description:"钢联化工指标分类id"`
+	ParentClassifyId                  int                    `description:"钢联化工指标父级分类id"`
+	IndexCode                         string                 `description:"指标编码"`
+	IndexName                         string                 `description:"指标名称"`
+	UnitName                          string                 `orm:"column(unit)"`
+	UniqueCode                        string                 `description:"唯一编码"`
+	FrequencyName                     string                 `orm:"column(frequency)"`
+	EdbInfoId                         int                    `description:"指标库的id"`
+	UpdateTime                        string                 `orm:"column(modify_time)"`
+	IsStop                            int                    `description:"是否停更:1:停更,0:未停更"`
+	IsSupplierStop                    int                    `description:"是否供应商停更:1:停更,0:未停更"`
+	Paging                            *paging.PagingItem     `description:"分页数据"`
+	DataList                          []*MysteelChemicalData `gorm:"-"`
 }
 
 // MysteelChemicalData 钢联化工数据列表

services/data/edb_info_refresh.go

@@ -423,6 +423,7 @@ func GetList(source, subSource int, classifyId, terminalCode, sysUserId, frequen
 		isStop = 0
 	}
 
+	fmt.Println(source, subSource, classifyId, terminalCode, sysUserId, frequency, keyword, status, startSize, pageSize, sortParam, sortType)
 	switch source {
 	case utils.DATA_SOURCE_MYSTEEL_CHEMICAL: // 钢联
 		if classifyId != `` {
@@ -524,6 +525,7 @@ func GetList(source, subSource int, classifyId, terminalCode, sysUserId, frequen
 
 		total, list, err = data_manage.GetSmmBaseInfoList(condition, pars, sortStr, startSize, pageSize)
 	default:
+		fmt.Println("line 530")
 		condition += ` AND source = ? AND sub_source = ? `
 		pars = append(pars, source, subSource)
 
@@ -577,7 +579,8 @@ func GetList(source, subSource int, classifyId, terminalCode, sysUserId, frequen
 		if sortParam != `` {
 			sortStr = fmt.Sprintf("%s %s,edb_info_id desc ", sortParam, sortType)
 		}
-
+		fmt.Println("line 582")
+		fmt.Println(condition, pars, sortStr, startSize, pageSize)
 		total, list, err = data_manage.GetEdbBaseInfoList(condition, pars, sortStr, startSize, pageSize)
 	}