Merge branch '9.9.1' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

controllers/chart_permission.go

@@ -6,7 +6,7 @@ import (
 	"hongze/hongze_cygx/utils"
 )
 
-//品种
+// 品种
 type ChartPermissionController struct {
 	BaseCommonController
 }
@@ -289,6 +289,10 @@ func (this *ChartPermissionAuthController) ReportDetailV7() {
 			resp.List[k].IsShowSustainable = true
 		}
 	}
+	item := new(models.ChartPermission)
+	item.PermissionName = utils.GU_SHOU_NAME
+	item.ChartPermissionId = utils.GU_SHOU_ID
+	resp.List = append(resp.List, item)
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "获取成功"

controllers/report.go

@@ -1549,11 +1549,11 @@ func (this *ReportController) Detail() {
 		br.Ret = 408
 		return
 	}
-	if user.CompanyId != utils.HZ_COMPANY_ID {
-		br.Msg = "报告编辑中，请稍后"
-		br.IsSendEmail = false
-		return
-	}
+	//if user.CompanyId != utils.HZ_COMPANY_ID {
+	//	br.Msg = "报告编辑中，请稍后"
+	//	br.IsSendEmail = false
+	//	return
+	//}
 	uid := user.UserId
 	articleId, _ := this.GetInt("ArticleId")
 	isBestNew, _ := this.GetBool("IsBestNew")

utils/constants.go

@@ -98,6 +98,8 @@ const (
 	HZ_COMPANY_ID                    int    = 16                                                                                                                                                                                                 // 弘则公司的ID
 	HONG_GUAN_NAME                   string = "宏观"
 	HONG_GUAN_ID                     int    = 1
+	GU_SHOU_NAME                     string = "固收"
+	GU_SHOU_ID                       int    = 100000   // 自定义权限类型ID ，十万起步
 	YAN_XUAN_ARTICLE_TYPE_IDS        string = "1,2,12" // 属于研选的报告类型ID
 	NO_YAN_XUAN_ARTICLE_TYPE_IDS     string = "13"     // 不属于研选的报告类型ID
 )