fix bug

models/company/company_permission.go

@@ -131,7 +131,12 @@ func GetPermissionVarietyItems(productId int, classifyName string) (items []*Per
 	//o := orm.NewOrmUsingDB("rddp")
 	//sql := ` SELECT * FROM chart_permission WHERE enabled=1 AND product_id=? AND classify_name=? GROUP BY permission_name ORDER BY sort ASC `
 	//_, err = o.Raw(sql, productId, classifyName).QueryRows(&items)
-	sql := ` SELECT * FROM chart_permission WHERE enabled=1 AND product_id=? AND classify_name=? GROUP BY permission_name ORDER BY sort ASC `
+	sql := ` SELECT chart_permission_id, chart_permission_name, permission_name, sort, enabled, created_time, last_updated_time, teleconference_sort, remark, classify_name, product_name, product_id, image_url, show_type, is_other, is_report, cygx_auth, permission_type, yb_img_url, product_permission_name, price_driven_state, image_url_m, parent_id, is_public 
+  	 FROM chart_permission WHERE enabled=1 AND product_id=? AND classify_name=? 
+
+	GROUP BY permission_name,
+	chart_permission_id, chart_permission_name, sort, enabled, created_time, last_updated_time, teleconference_sort, remark, classify_name, product_name, product_id, image_url, show_type, is_other, is_report, cygx_auth, permission_type, yb_img_url, product_permission_name, price_driven_state, image_url_m, parent_id, is_public
+	ORDER BY sort ASC `
 	err = global.DmSQL["rddp"].Raw(sql, productId, classifyName).Find(&items).Error
 	return
 }

models/data_manage/baiinfo_data.go

@@ -11,12 +11,12 @@ type BaiinfoClassify struct {
 	TypeCode string `orm:"column(type_code)" description:"分类名称编码"`
 }
 
-func GetBaiinfoClassify() (items []*BaiinfoClassify, err error) {
-	sql := `SELECT CONCAT(type_2,type_3) AS type_name,CONCAT(type_2,'#',type_3) type_code  FROM base_from_baiinfo_index GROUP BY CONCAT(type_2,type_3) ORDER BY CONCAT(type_2,type_3) ASC `
-	err = global.DmSQL["data"].Raw(sql).Scan(&items).Error
-
-	return
-}
+//func GetBaiinfoClassify() (items []*BaiinfoClassify, err error) {
+//	sql := `SELECT CONCAT(type_2,type_3) AS type_name,CONCAT(type_2,'#',type_3) type_code  FROM base_from_baiinfo_index GROUP BY CONCAT(type_2,type_3) ORDER BY CONCAT(type_2,type_3) ASC `
+//	err = global.DmSQL["data"].Raw(sql).Scan(&items).Error
+//
+//	return
+//}
 
 type BaiinfoFrequency struct {
 	Frequency string `description:"频度"`

models/data_manage/chart_info.go

@@ -1934,29 +1934,29 @@ type ChartInfoView struct {
 	Sort              int    `description:"排序字段，数字越小越排前面"`
 	IsAdd             bool   `description:"true:已加入我的图库,false:未加入我的图库"`
 	MyChartId         int
-	MyChartClassifyId string `description:"我的图表分类，多个用逗号隔开"`
-	ChartClassify     []*ChartClassifyView
-	EdbEndDate        string `description:"指标最新更新日期"`
-	XMin              string `description:"图表X轴最小值"`
-	XMax              string `description:"图表X轴最大值"`
-	LeftMin           string `description:"图表左侧最小值"`
-	LeftMax           string `description:"图表左侧最大值"`
-	RightMin          string `description:"图表右侧最小值"`
-	RightMax          string `description:"图表右侧最大值"`
-	Right2Min         string `description:"图表右侧最小值"`
-	Right2Max         string `description:"图表右侧最大值"`
-	MinMaxSave        int    `description:"是否手动保存过上下限：0-否；1-是"`
-	IsEdit            bool   `description:"是否有编辑权限"`
-	IsEnChart         bool   `description:"是否展示英文标识"`
-	WarnMsg           string `description:"错误信息"`
-	Disabled          int    `description:"是否禁用，0：启用，1：禁用，默认：0"`
-	BarConfig         string `description:"柱方图的配置，json数据" json:"-"`
-	Source            int    `description:"1：ETA图库；2：商品价格曲线；3：相关性图表"`
+	MyChartClassifyId string               `description:"我的图表分类，多个用逗号隔开"`
+	ChartClassify     []*ChartClassifyView `gorm:"-"`
+	EdbEndDate        string               `description:"指标最新更新日期"`
+	XMin              string               `description:"图表X轴最小值"`
+	XMax              string               `description:"图表X轴最大值"`
+	LeftMin           string               `description:"图表左侧最小值"`
+	LeftMax           string               `description:"图表左侧最大值"`
+	RightMin          string               `description:"图表右侧最小值"`
+	RightMax          string               `description:"图表右侧最大值"`
+	Right2Min         string               `description:"图表右侧最小值"`
+	Right2Max         string               `description:"图表右侧最大值"`
+	MinMaxSave        int                  `description:"是否手动保存过上下限：0-否；1-是"`
+	IsEdit            bool                 `description:"是否有编辑权限"`
+	IsEnChart         bool                 `description:"是否展示英文标识"`
+	WarnMsg           string               `description:"错误信息"`
+	Disabled          int                  `description:"是否禁用，0：启用，1：禁用，默认：0"`
+	BarConfig         string               `description:"柱方图的配置，json数据" json:"-"`
+	Source            int                  `description:"1：ETA图库；2：商品价格曲线；3：相关性图表"`
 	//CorrelationLeadUnit string `description:"相关性图表-领先单位"`
 	ExtraConfig       string          `description:"图表额外配置,json数据"`
 	ChartSource       string          `description:"图表来源str"`
 	ChartSourceEn     string          `description:"图表来源（英文）"`
-	Button            ChartViewButton `description:"操作按钮"`
+	Button            ChartViewButton `gorm:"-" description:"操作按钮"`
 	SeasonExtraConfig string          `description:"季节性图表中的配置,json数据"`
 	StartYear         int             `description:"当选择的日期类型为最近N年类型时，即date_type=20, 用start_year表示N"`
 	ChartThemeId      int             `description:"图表应用主题ID"`

models/data_manage/my_chart.go

@@ -570,11 +570,20 @@ func GetMyChartListByAdminId(adminId int) (item []*MyChartView, err error) {
 
 	//sql := ` SELECT * FROM my_chart WHERE 1=1 AND admin_id=? `
 
-	sql := ` SELECT a.*,GROUP_CONCAT(c.my_chart_classify_id SEPARATOR ',') AS my_chart_classify_id FROM my_chart AS a
+	sql := ` SELECT 
+           a.my_chart_id,a.chart_info_id,a.source,a.admin_id,a.create_time,a.modify_time,LISTAGG(c.my_chart_classify_id, ',') WITHIN GROUP (ORDER BY c.my_chart_classify_id) AS my_chart_classify_id
+            FROM my_chart AS a
 			LEFT JOIN  my_chart_classify_mapping AS b ON a.my_chart_id=b.my_chart_id AND a.admin_id=b.admin_id
 			LEFT JOIN my_chart_classify AS c ON b.my_chart_classify_id=c.my_chart_classify_id AND b.admin_id=c.admin_id
 			WHERE 1=1 AND a.admin_id=?
-			GROUP BY a.chart_info_id `
+			GROUP BY   
+			a.chart_info_id,
+			a.my_chart_id,
+			a.chart_info_id,
+			a.source,
+			a.admin_id,
+			a.create_time,
+			a.modify_time `
 	err = global.DmSQL["data"].Raw(sql, adminId).Find(&item).Error
 	return
 }

services/task.go

@@ -29,7 +29,8 @@ func Task() {
 
 	//data.GetSmmIndex()
 	//data.GetSmmIndexData()
-	go AutoInsertLogToDB()
+
+	//go AutoInsertLogToDB()
 
 	//手工数据表格导入后的指标库刷新
 	go ImportManualDataRefresh()
@@ -40,7 +41,7 @@ func Task() {
 	//修复用户关注标识
 	//GetWxUsersSubscribe()
 
-	go AutoInsertAdminOperateRecordToDB()
+	//go AutoInsertAdminOperateRecordToDB()
 
 	// 指标刷新
 	go data.HandleEdbRefreshQueue()