Merge branch 'cygx_13.2' of http://8.136.199.33:3000/cxzhang/hongze_clpt into debug

controllers/chart_permission.go

@@ -40,6 +40,12 @@ func (this *ChartPermissionController) Detail() {
 		return
 	}
 	resp := new(models.ChartPermissionListResp)
+
+	for _, v := range list {
+		if v.PermissionName == utils.CHART_PERMISSION_NAME_MF_YANXUAN {
+			v.PermissionName = utils.MAI_FANG_YAN_XUAN_NAME
+		}
+	}
 	resp.List = list
 	br.Ret = 200
 	br.Success = true
@@ -105,6 +111,11 @@ func (this *MobileChartPermissionAuthController) ListByActivity() {
 		br.ErrMsg = "获取品种信息失败,Err:" + err.Error()
 		return
 	}
+	for _, v := range list {
+		if v.PermissionName == utils.CHART_PERMISSION_NAME_MF_YANXUAN {
+			v.PermissionName = utils.MAI_FANG_YAN_XUAN_NAME
+		}
+	}
 	resp := new(models.ChartPermissionListResp)
 	if user.CompanyId > 1 {
 		chartList, err := models.GetUserCompanyPermissionSand(user.CompanyId)

utils/constants.go

@@ -73,6 +73,7 @@ const (
 	CE_LUE_NAME                      string = "策略"
 	CE_LUE_ID                        int    = 23
 	CHART_PERMISSION_NAME_YANXUAN    string = "研选"
+	MAI_FANG_YAN_XUAN_NAME           string = "买方研选"
 	CHART_PERMISSION_NAME_MF_YANXUAN string = "研选订阅"
 	CHART_PERMISSION_ID_YANXUAN      int    = 31      //权限研选订阅id
 	YAN_XUAN_KOU_DIAN_BAO_ID         int    = 52      //研选扣点包ID