Merge branch 'cygx/cygx_14-5' of http://8.136.199.33:3000/hongze/hz_crm_api into debug

controllers/company_apply_v2.go

@@ -884,11 +884,7 @@ func (this *CompanyApplyController) ApplyTurnPositive() {
 				item.ExpensiveYx = expensiveYx
 			}
 			//如果是研选扣点包，这个行业权限的ID；那么就对点数进行赋值。目前就研选扣点包 这一个行业有点数，先不用数组类型处理。v:查研观向13.2
-			if chartPermissionId == utils.YAN_XUAN_KOU_DIAN_BAO_ID {
-				if req.Points <= 0 {
-					br.Msg = "点数不能为空"
-					return
-				}
+			if chartPermissionId == utils.GetRaiChartPermissionIdSpecialPoint() {
 				item.Points = req.Points
 			}
 

models/company/company_permission.go

@@ -32,6 +32,8 @@ type PermissionSetItem struct {
 	ParentId          int    `description:"父级权限id"`
 	IsPublic          int    `description:"是否是公有权限1:公有权限，0私有权限"`
 	Checked           bool   `description:"选中状态"`
+	ShowInput         bool   `description:"是否包含输入框"`
+	ChartContent      string `description:"权限申请时下面的框点数回显"`
 
 	Child []*PermissionSetItem `description:"具体的主客观-方便前端的排版用的"`
 }

utils/constants.go

@@ -428,6 +428,16 @@ const (
 	WX_USER_RAI_LABEL_KEY                          = "CYGX_WX_USER_RAI_LABEL_KEY" //用户列表标签key
 )
 
+// GetRaiChartPermissionIdSpecialPoint 获取权益权限，专项路演调研权限ID
+func GetRaiChartPermissionIdSpecialPoint() (chartPermissionId int) {
+	if RunMode == "release" {
+		chartPermissionId = 70
+	} else {
+		chartPermissionId = 157
+	}
+	return
+}
+
 // 权益cygx_config配置主键以后放这里
 const (
 	YANXUAN_SPECIAL_ARTICLE_BUTTON_MOBILE string = "yanxuan_special_article_button_mobile" //CRM研选专栏模块文章管理可以查看的手机号