修改bug

controllers/base_auth.go

@@ -231,6 +231,10 @@ func (c *BaseAuthController) Prepare() {
 			for _, s := range apis {
 				apiMap[s] = true
 			}
+
+			fmt.Println("uri:", uri)
+
+			fmt.Println(apiMap)
 			if !apiMap[uri] {
 				c.JSON(models.BaseResponse{Ret: 403, Msg: "无权访问！", ErrMsg: "无权访问！"}, false, false)
 				c.StopRun()

models/data_manage/chart_info.go

@@ -1157,7 +1157,7 @@ func EditChartInfoAndMapping(req *EditChartInfoReq, edbInfoIdStr string, calenda
 	sql += `WHERE chart_info_id = ?`
 
 	pars = append(pars, req.ChartInfoId)
-	err = to.Exec(sql, pars).Error
+	err = to.Exec(sql, pars...).Error
 	if err != nil {
 		fmt.Println("UPDATE  chart_info Err:", err.Error())
 		return err
@@ -1315,7 +1315,7 @@ func EditFutureGoodChartInfoAndMapping(req *EditFutureGoodChartInfoReq, edbInfoI
 	sql += `WHERE chart_info_id = ?`
 
 	pars = append(pars, req.ChartInfoId)
-	err = to.Exec(sql, pars).Error
+	err = to.Exec(sql, pars...).Error
 	if err != nil {
 		fmt.Println("UPDATE  chart_info Err:", err.Error())
 		return err

models/data_manage/edb_info.go

@@ -1391,6 +1391,8 @@ func GetEdbInfoListByCondition(condition string, pars []interface{}, startSize,
 	sql += orderDesc
 	sql += ` LIMIT ?,? `
 
+	pars = append(pars, startSize)
+	pars = append(pars, pageSize)
 	err = o.Raw(sql, pars...).Scan(&items).Error
 
 	return

models/data_manage/my_chart.go

@@ -1137,17 +1137,29 @@ func GetMyChartListGroupByCharyInfoIdAndAdminIdByCondition(condition string, par
 	//sql += " GROUP BY a.chart_info_id,a.admin_id ORDER BY c.sort DESC "
 	//_, err = o.Raw(sql, pars).QueryRows(&item)
 
-	sql := ` SELECT a.admin_id,a.my_chart_id,c.sort,b.*,GROUP_CONCAT(DISTINCT d.my_chart_classify_name) AS my_chart_classify_name,GROUP_CONCAT(DISTINCT d.my_chart_classify_id) AS my_chart_classify_id
-			FROM  my_chart AS a
-			INNER JOIN chart_info AS b ON a.chart_info_id=b.chart_info_id
-			INNER JOIN my_chart_classify_mapping AS c ON a.my_chart_id=c.my_chart_id
-			INNER JOIN my_chart_classify AS d ON c.my_chart_classify_id=d.my_chart_classify_id
-			WHERE 1=1 `
+	//sql := ` SELECT a.admin_id,a.my_chart_id,c.sort,b.*,LISTAGG(DISTINCT d.my_chart_classify_name, ',') WITHIN GROUP (ORDER BY d.my_chart_classify_name) AS my_chart_classify_name,LISTAGG(d.my_chart_classify_id, ',') WITHIN GROUP (ORDER BY d.my_chart_classify_id) AS my_chart_classify_id
+	//		FROM  my_chart AS a
+	//		INNER JOIN chart_info AS b ON a.chart_info_id=b.chart_info_id
+	//		INNER JOIN my_chart_classify_mapping AS c ON a.my_chart_id=c.my_chart_id
+	//		INNER JOIN my_chart_classify AS d ON c.my_chart_classify_id=d.my_chart_classify_id
+	//		WHERE 1=1 `
+	//
+	//if condition != "" {
+	//	sql += condition
+	//}
+	//sql += " GROUP BY a.chart_info_id,a.admin_id ORDER BY c.sort DESC "
 
+	sql := `SELECT a.admin_id,a.my_chart_id,c.sort,b.chart_info_id, b.chart_name, b.unique_code, b.chart_classify_id, b.sys_user_id, b.sys_user_real_name, b.create_time, b.modify_time, b.date_type, b.start_date, b.end_date, b.is_set_name, b.edb_info_ids, b.chart_type, b.calendar, b.season_start_date, b.season_end_date, b.chart_image, b.sort, b.edb_end_date, b.x_min, b.x_max, b.left_min, b.left_max, b.right_min, b.right_max, b.right2_min, b.right2_max, b.min_max_save, b.chart_name_en, b.disabled, b.bar_config, b.source, b.extra_config, b.season_extra_config, b.start_year, b.chart_theme_id, b.sources_from, b.instructions, b.markers_lines, b.markers_areas, b.unit, b.unit_en, b.is_join_permission, b.forum_chart_info_id, b.chart_alias, b.date_type_num,LISTAGG(DISTINCT d.my_chart_classify_name, ',') WITHIN GROUP (ORDER BY d.my_chart_classify_name) AS my_chart_classify_name,LISTAGG(d.my_chart_classify_id, ',') WITHIN GROUP (ORDER BY d.my_chart_classify_id) AS my_chart_classify_id
+FROM  "eta_index".my_chart AS a
+INNER JOIN "eta_index".chart_info AS b ON a.chart_info_id=b.chart_info_id
+INNER JOIN "eta_index".my_chart_classify_mapping AS c ON a.my_chart_id=c.my_chart_id
+INNER JOIN "eta_index".my_chart_classify AS d ON c.my_chart_classify_id=d.my_chart_classify_id
+WHERE 1=1  `
 	if condition != "" {
 		sql += condition
 	}
-	sql += " GROUP BY a.chart_info_id,a.admin_id ORDER BY c.sort DESC "
+	sql += " GROUP BY a.chart_info_id,a.admin_id,c.sort,a.my_chart_id,b.chart_info_id, b.chart_name, b.unique_code, b.chart_classify_id, b.sys_user_id, b.sys_user_real_name, b.create_time, b.modify_time, b.date_type, b.start_date, b.end_date, b.is_set_name, b.edb_info_ids, b.chart_type, b.calendar, b.season_start_date, b.season_end_date, b.chart_image, b.sort, b.edb_end_date, b.x_min, b.x_max, b.left_min, b.left_max, b.right_min, b.right_max, b.right2_min, b.right2_max, b.min_max_save, b.chart_name_en, b.disabled, b.bar_config, b.source, b.extra_config, b.season_extra_config, b.start_year, b.chart_theme_id, b.sources_from, b.instructions, b.markers_lines, b.markers_areas, b.unit, b.unit_en, b.is_join_permission, b.forum_chart_info_id, b.chart_alias, b.date_type_num" +
+		" ORDER BY c.sort DESC "
 	err = global.DmSQL["data"].Raw(sql, pars...).Find(&item).Error
 	return
 }