Merge remote-tracking branch 'origin/debug' into debug

controllers/eta_forum/eta_forum.go

@@ -6,6 +6,7 @@ import (
 	"eta/eta_api/models/data_manage"
 	"eta/eta_api/services/eta_forum"
 	"eta/eta_api/utils"
+	"github.com/rdlucklib/rdluck_tools/paging"
 )
 
 type EtaForumController struct {
@@ -51,10 +52,19 @@ func (this *EtaForumController) UserChartList() {
 		telAreaCode = utils.TelAreaCodeHome
 	}
 
-	resp, err, errMsg := eta_forum.GetUserChartList(businessCode, userMobile, telAreaCode, keyword, currentIndex, pageSize)
+	resp, err, _ := eta_forum.GetUserChartList(businessCode, userMobile, telAreaCode, keyword, currentIndex, pageSize)
 	if err != nil {
-		br.Msg = errMsg
-		br.ErrMsg = err.Error()
+		/*br.Msg = errMsg
+		br.ErrMsg = err.Error()*/
+		page := paging.GetPaging(currentIndex, pageSize, 0)
+		resp = eta_forum.UserChartListRespItem{
+			ChartInfoList: make([]*data_manage.ChartInfo, 0),
+			Paging:        page,
+		}
+		br.Ret = 200
+		br.Success = true
+		br.Msg = "保存成功"
+		br.Data = resp
 		return
 	}
 
@@ -101,10 +111,16 @@ func (this *EtaForumController) UserCollectChartClassifyList() {
 		telAreaCode = utils.TelAreaCodeHome
 	}
 
-	resp, err, errMsg := eta_forum.GetUserCollectChartClassifyList(businessCode, userMobile, telAreaCode)
+	resp, err, _ := eta_forum.GetUserCollectChartClassifyList(businessCode, userMobile, telAreaCode)
 	if err != nil {
-		br.Msg = errMsg
-		br.ErrMsg = err.Error()
+		resp = eta_forum.UserCollectChartClassifyListItem{
+			List:     make([]*eta_forum.ChartCollectClassifyItem, 0),
+			Language: "CN",
+		}
+		br.Ret = 200
+		br.Success = true
+		br.Msg = "保存成功"
+		br.Data = resp
 		return
 	}
 
@@ -156,10 +172,17 @@ func (this *EtaForumController) UserCollectChartList() {
 	currentIndex, _ := this.GetInt("CurrentIndex")
 	keyword := this.GetString("Keyword")
 
-	resp, err, errMsg := eta_forum.GetUserCollectChartList(businessCode, userMobile, telAreaCode, keyword, collectClassifyIds, currentIndex, pageSize)
+	resp, err, _ := eta_forum.GetUserCollectChartList(businessCode, userMobile, telAreaCode, keyword, collectClassifyIds, currentIndex, pageSize)
 	if err != nil {
-		br.Msg = errMsg
-		br.ErrMsg = err.Error()
+		page := paging.GetPaging(currentIndex, pageSize, 0)
+		resp = eta_forum.UserCollectChartListRespItem{
+			List:   make([]*eta_forum.ChartCollectView, 0),
+			Paging: page,
+		}
+		br.Ret = 200
+		br.Success = true
+		br.Msg = "保存成功"
+		br.Data = resp
 		return
 	}
 

models/data_source/data_source.go

@@ -1907,8 +1907,8 @@ func GetBaseIndexDataTableName(source, subSource int) (indexTable, dataTable str
 		indexTable = "base_from_fenwei_index"
 		dataTable = "base_from_fenwei_data"
 	case utils.DATA_SOURCE_SCI99:
-		indexTable = "base_from_icpi_index"
-		dataTable = "base_from_icpi_data"
+		indexTable = "base_from_sci99_index"
+		dataTable = "base_from_sci99_data"
 	case utils.DATA_SOURCE_BUSINESS:
 		indexTable = "base_from_business_index"
 		dataTable = "base_from_business_data"

services/document_manage_service/document_manage_service.go

@@ -243,7 +243,7 @@ func RuiSiReportList(classifyIdFirst, classifyIdSecond, classifyIdThird int, cha
 	// 作者为 全球市场战略研究中心 PCI Research
 	//condition += ` and a.author = '战研中心 PCIR'`
 	// 已发布的报告
-	condition += ` and a.state = 2`
+	condition += ` AND a.state IN (2,6) AND a.is_public_publish = 1 `
 
 	if len(chartPermissionIdList) > 0 {
 		classifyIds, err := models.GetClassifyIdsByPermissionId(chartPermissionIdList)

services/eta_forum/eta_forum_hub_lib.go

@@ -83,6 +83,9 @@ func ChartThemeTypeSaveLib(req string) (resp *models.BaseResponse, err error) {
 // GetUserChartListLib 查询有权限的图表列表
 func GetUserChartListLib(req string) (resp *UserChartListResp, err error) {
 	_, resultByte, err := get(req, "/v1/chart/user/chart_list")
+	if err != nil {
+		return
+	}
 	err = json.Unmarshal(resultByte, &resp)
 	if err != nil {
 		return
@@ -93,6 +96,9 @@ func GetUserChartListLib(req string) (resp *UserChartListResp, err error) {
 // getUserCollectChartClassifyLib 查询收藏的分类列表
 func getUserCollectChartClassifyLib(req string) (resp *UserCollectChartClassifyListResp, err error) {
 	_, resultByte, err := get(req, "/v1/chart_collect/classify/list")
+	if err != nil {
+		return
+	}
 	err = json.Unmarshal(resultByte, &resp)
 	if err != nil {
 		return
@@ -103,6 +109,9 @@ func getUserCollectChartClassifyLib(req string) (resp *UserCollectChartClassifyL
 // getUserCollectChartListLib 查询收藏的图表列表
 func getUserCollectChartListLib(req string) (resp *UserCollectChartListResp, err error) {
 	_, resultByte, err := get(req, "/v1/chart_collect/chart/list")
+	if err != nil {
+		return
+	}
 	err = json.Unmarshal(resultByte, &resp)
 	if err != nil {
 		return