fix

controllers/roadshow/calendar.go

@@ -979,18 +979,20 @@ func (this *CalendarController) ResearcherList() {
 		return
 	}
 	researcherList, err := roadshow.GetResearcher()
-	groupMap := make(map[int][]*roadshow.Researcher)
+	groupMap := make(map[int][]*roadshow.ResearcherGroup)
 	for _, v := range researcherList {
-		//if v.RoleTypeCode == "ficc_admin" {
-		//	findItems := groupMap[1]
-		//	findItems = append(findItems, v)
-		//	groupMap[1] = findItems
-		//} else {
+		item := &roadshow.ResearcherGroup{
+			GroupId:      v.GroupId,
+			GroupName:    v.GroupName,
+			AdminId:      v.AdminId,
+			RealName:     v.RealName,
+			RoleTypeCode: v.RoleTypeCode,
+		}
 		if findItems, ok := groupMap[v.GroupId]; ok {
-			findItems = append(findItems, v)
+			findItems = append(findItems, item)
 			groupMap[v.GroupId] = findItems
 		} else {
-			findItems = append(findItems, v)
+			findItems = append(findItems, item)
 			groupMap[v.GroupId] = findItems
 		}
 		//}
@@ -1002,7 +1004,7 @@ func (this *CalendarController) ResearcherList() {
 	ficcGroup := new(roadshow.ResearcherGroup)
 	ficcGroup.GroupId = 999
 	ficcGroup.GroupName = "ficc"
-	ficcGroup.Child = group
+	ficcGroup.ResearcherList = group
 
 
 	sysUserList, err := system.GetAdminList()
@@ -1021,7 +1023,7 @@ func (this *CalendarController) ResearcherList() {
 		br.ErrMsg = "获取失败,GetAskEmailList Err: " + err.Error()
 		return
 	}
-	mapPermissionUser := make(map[string][]*roadshow.Researcher)
+	mapPermissionUser := make(map[string][]*roadshow.ResearcherGroup)
 	listPermission, err := cygx.GetChartPermissionAll()
 	if err != nil {
 		br.Msg = "获取信息失败"
@@ -1034,7 +1036,7 @@ func (this *CalendarController) ResearcherList() {
 	}
 	for _, v := range askUserList {
 		if admin, ok := adminMap[v.AdminId]; ok {
-			item := &roadshow.Researcher{
+			item := &roadshow.ResearcherGroup{
 				AdminId:      v.AdminId,
 				RealName:     v.Name,
 				GroupId:      admin.GroupId,
@@ -1056,7 +1058,7 @@ func (this *CalendarController) ResearcherList() {
 	raiGroup := new(roadshow.ResearcherGroup)
 	raiGroup.GroupId = 888
 	raiGroup.GroupName = "权益"
-	raiGroup.Child = raiList
+	raiGroup.ResearcherList = raiList
 
 	var resp []*roadshow.ResearcherGroup
 	resp = append(resp, ficcGroup, raiGroup)

controllers/roadshow/report.go

@@ -84,22 +84,27 @@ func (this *CalendarController) ResearcherReportList() {
 		br.ErrMsg = "获取分组信息失败！,GetResearcherV2 Err:" + err.Error()
 		return
 	}
-	groupMap := make(map[int][]*roadshow.Researcher)
+	groupMap := make(map[int][]*roadshow.ResearcherGroup)
 	for _, v := range researcherList {
-		//if v.RoleTypeCode == "ficc_admin" {
-		//	findItems := groupMap[1]
-		//	findItems = append(findItems, v)
-		//	groupMap[1] = findItems
-		//} else {
+		item := &roadshow.ResearcherGroup{
+			GroupId:      v.GroupId,
+			GroupName:    v.GroupName,
+			AdminId:      v.AdminId,
+			RealName:     v.RealName,
+			RoleTypeCode: v.RoleTypeCode,
+		}
 		if findItems, ok := groupMap[v.GroupId]; ok {
-			findItems = append(findItems, v)
+			findItems = append(findItems, item)
 			groupMap[v.GroupId] = findItems
 		} else {
-			findItems = append(findItems, v)
+			findItems = append(findItems, item)
 			groupMap[v.GroupId] = findItems
 		}
 		//}
 	}
+	for _, v := range group {
+		v.ResearcherList = groupMap[v.GroupId]
+	}
 
 	groupReportRecordList := make([]roadshow.GroupReportRecord, 0)
 	rsAllReportRecordNumList := make([]roadshow.RsReportRecordNum, 0)

models/roadshow/calendar.go

@@ -158,8 +158,10 @@ type ResearcherIds struct {
 type ResearcherGroup struct {
 	GroupId        int    `description:"分组id"`
 	GroupName      string `description:"分组名称"`
-	ResearcherList []*Researcher
-	Child          []*ResearcherGroup
+	AdminId        int    `description:"研究员id"`
+	RealName       string `description:"研究员名称"`
+	RoleTypeCode   string `description:"角色编码"`
+	ResearcherList []*ResearcherGroup
 }
 
 func GetResearcherGroup() (list []*ResearcherGroup, err error) {