Merge branch 'dev/v4.9.27_fu' of qmx/jy into feature/v4.9.27

src/config.json

@@ -465,5 +465,23 @@
   "precisionNum": 50,
   "ossUrl":"https://jydocs-previewimg.oss-cn-beijing.aliyuncs.com/%s",
   "docinUrl":"https://img3.douding.cn/docin_%s_90x80.jpg",
-  "h5": "https://h5.jianyu360.cn"
+  "h5": "https://h5.jianyu360.cn",
+  "indexDocClass": [
+    {
+      "class": "招标文件",
+      "search": "招标文件"
+    },
+    {
+      "class": "办公文档",
+      "search": "招标投标"
+    },
+    {
+      "class": "行业报告",
+      "search": "行业报告"
+    },
+    {
+      "class": "建筑/环境",
+      "search": "建筑/环境"
+    }
+  ]
 }

src/jfw/front/index.go

@@ -299,17 +299,18 @@ func GetDocsData() (docClass []string, indexDocs [][]map[string]interface{}) {
 		docinUrl = common.InterfaceToStr(config.Sysconfig["docinUrl"]) //"https://img3.douding.cn/docin_%s_90x80.jpg"
 	)
 	//浏览量前十的一级分类
-	classSql := `SELECT dc.name,dc.code FROM jydocs.doc_class_statistics dcs LEFT JOIN jydocs.doc_class dc ON dcs.code = dc.code AND dcs.state = dc.state WHERE dc.level = 1 ORDER BY dcs.total DESC ;`
-	docClassNames := public.BaseMysql.SelectBySql(classSql)
-	if docClassNames != nil && len(*docClassNames) > 0 {
+	docClassNames := config.Sysconfig["indexDocClass"].([]interface{})
+	if docClassNames != nil && len(docClassNames) > 0 {
 		docSql := `SELECT d.id,d.docName,d.docFileSuffix,d.docTags,d.previewImgId,d.productType,d.source FROM jydocs.doc d LEFT JOIN jydocs.doc_statistics ds ON d.id=ds.docId WHERE FIND_IN_SET(?,d.docTags) ORDER BY ds.viewTimes DESC LIMIT 10 `
-		for _, dv := range *docClassNames {
-			if len(docClass) > 7 {
-				break
+		for _, dv := range docClassNames {
+			tmpClass := common.ObjToMap(dv)
+			if tmpClass == nil {
+				continue
 			}
-			name := common.InterfaceToStr(dv["name"])
+			name := common.InterfaceToStr((*tmpClass)["class"])
+			search := common.InterfaceToStr((*tmpClass)["search"])
 			indexDoc := []map[string]interface{}{}
-			docs := public.BaseMysql.SelectBySql(docSql, name)
+			docs := public.BaseMysql.SelectBySql(docSql, search)
 			if docs != nil && len(*docs) > 0 {
 				for dock, docv := range *docs {
 					if dock > 7 {
@@ -332,10 +333,9 @@ func GetDocsData() (docClass []string, indexDocs [][]map[string]interface{}) {
 					})
 				}
 			}
-			if len(indexDoc) > 0 {
-				docClass = append(docClass, name)
-				indexDocs = append(indexDocs, indexDoc)
-			}
+			docClass = append(docClass, name)
+			indexDocs = append(indexDocs, indexDoc)
+
 		}
 	}
 	if len(indexDocs) > 0 {