Merge branch 'cygx/cygx_need_993' of http://8.136.199.33:3000/hongze/hz_crm_api into debug

controllers/cygx/rai_serve.go

@@ -82,7 +82,14 @@ func (this *RaiServeCoAntroller) SearchTag() {
 	}
 
 	resp := new(cygx.RaiServeTagListResp)
-	list, err := cygx.GetRaiServeSearchTagRespList(keyWord)
+	var chartPermissionId string
+
+	if utils.RunMode == "" {
+		chartPermissionId = "19, 20, 21, 22 ,62 "
+	} else {
+		chartPermissionId = "19, 20, 21, 22 ,148 "
+	}
+	list, err := cygx.GetRaiServeSearchTagRespList(keyWord, chartPermissionId)
 	if err != nil {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取数据失败，Err:" + err.Error()

models/cygx/rai_serve_bill.go

@@ -53,7 +53,7 @@ type RaiServeCoverageRateResp struct {
 }
 
 // 服务类型列表
-func GetRaiServeSearchTagRespList(keywords string) (items []*RaiServeTagResp, err error) {
+func GetRaiServeSearchTagRespList(keywords, chartPermissionId string) (items []*RaiServeTagResp, err error) {
 	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT
 			1 AS tag_type,
@@ -64,7 +64,7 @@ func GetRaiServeSearchTagRespList(keywords string) (items []*RaiServeTagResp, er
 			cygx_industrial_management AS i 
 		WHERE
 			1 = 1 
-			AND i.chart_permission_id IN ( 19, 20, 21, 22 ) 
+			AND i.chart_permission_id IN (` + chartPermissionId + ` ) 
 			AND  (i.industry_name LIKE '%` + keywords + `%' ) UNION ALL
 		SELECT
 			2 AS tag_type,
@@ -76,7 +76,7 @@ func GetRaiServeSearchTagRespList(keywords string) (items []*RaiServeTagResp, er
 			INNER JOIN cygx_industrial_management AS i ON i.industrial_management_id = s.industrial_management_id 
 		WHERE
 			1 = 1 
-			AND i.chart_permission_id IN ( 19, 20, 21, 22 ) 
+			AND i.chart_permission_id IN (` + chartPermissionId + ` ) 
 			AND ( s.subject_name LIKE  '%` + keywords + `%') 
 		ORDER BY
 			create_time ASC `