|
|
@@ -1443,10 +1443,29 @@ func (this *ActivityCoAntroller) ChartPermissionListAct() {
|
|
|
br.Ret = 408
|
|
|
return
|
|
|
}
|
|
|
- //数据库新加行业分类，与之前的项目权限部分冲突太多，故采用自定义而不去数据库查找
|
|
|
- resp := new(cygx.ChartPermissionRepMoreList)
|
|
|
- // 查研观向7.4-策略后面新增一个宏观
|
|
|
- resp.List = cygxService.GetActChartPermissionList()
|
|
|
+
|
|
|
+ resp := new(cygx.ChartPermissionResp)
|
|
|
+ list, err := cygx.GetChartPermissionAll()
|
|
|
+ if err != nil {
|
|
|
+ br.Msg = "获取信息失败"
|
|
|
+ br.ErrMsg = "获取品种信息失败,Err:" + err.Error()
|
|
|
+ return
|
|
|
+ }
|
|
|
+
|
|
|
+ for _, v := range list {
|
|
|
+ if v.PermissionName == utils.CHART_PERMISSION_NAME_MF_YANXUAN || v.PermissionName == utils.YAN_XUAN_KOU_DIAN_BAO_NAME {
|
|
|
+ continue
|
|
|
+ }
|
|
|
+ resp.List = append(resp.List, v)
|
|
|
+ }
|
|
|
+
|
|
|
+ // 查研观向7.4-新增一个宏观
|
|
|
+ macro := &cygx.ChartPermission{
|
|
|
+ ChartPermissionId: 1,
|
|
|
+ PermissionName: "宏观",
|
|
|
+ }
|
|
|
+ resp.List = append(resp.List, macro)
|
|
|
+
|
|
|
br.Ret = 200
|
|
|
br.Success = true
|
|
|
br.Msg = "获取成功"
|
xingzai