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

controllers/roadshow/calendar.go

@@ -1075,6 +1075,25 @@ func (this *CalendarController) ResearcherList() {
 	for _, v := range listPermission {
 		mapPermissionId[v.PermissionName] = v.ChartPermissionId
 	}
+
+	sysUserFwang, e := system.GetSysUserByAdminName("fwang") // 手动拼接王芳到权益的策略行业下 start
+	if e != nil {
+		if e.Error() == utils.ErrNoRow() {
+			br.Msg = "用户不存在, 请检查"
+			return
+		}
+		br.Msg = "账号错误, 请重新输入"
+		br.ErrMsg = "fwang 用户名获取用户失败, Err: " + e.Error()
+		return
+	}
+	itemFwang := new(roadshow.ResearcherGroup)
+	itemFwang.AdminId = sysUserFwang.AdminId
+	itemFwang.GroupId = sysUserFwang.GroupId
+	itemFwang.GroupName = sysUserFwang.GroupName
+	itemFwang.RealName = sysUserFwang.RealName
+	itemFwang.RoleTypeCode = sysUserFwang.RoleTypeCode
+	mapPermissionUser["策略"] = append(mapPermissionUser["策略"], itemFwang) // 手动拼接王芳到权益的策略行业下 end
+
 	for _, v := range askUserList {
 		if admin, ok := adminMap[v.AdminId]; ok {
 			item := &roadshow.ResearcherGroup{
@@ -1087,6 +1106,7 @@ func (this *CalendarController) ResearcherList() {
 			mapPermissionUser[v.ChartPermissionName] = append(mapPermissionUser[v.ChartPermissionName], item)
 		}
 	}
+
 	raiList := make([]*roadshow.ResearcherGroup, 0)
 	for k, v := range mapPermissionUser {
 		respItem := new(roadshow.ResearcherGroup)

utils/constants.go

@@ -432,8 +432,10 @@ const (
 )
 
 var CYGX_REGISTER_PLATFORM_MAP = map[string]string{
-	"1": "小程序",
-	"2": "网页版",
+	"1": "查研小程序",
+	"2": "查研网页版",
+	"5": "研选小程序",
+	"6": "研选网页版",
 }
 
 var ACTIVITY_SPECIAL_TRIP_PERMISSION_NAME_OTHER = []string{"策略", "固收", "周期"} //专项调研活动带扣点的行业