|
@@ -137,18 +137,18 @@ func (this *CalendarController) ResearcherReportList() {
|
|
|
researcherList = append(researcherList, item)
|
|
|
}
|
|
|
}
|
|
|
- for _, vP := range listPermission {
|
|
|
- for k, v := range mapPermissionUser {
|
|
|
- if vP.PermissionName != k {
|
|
|
- continue
|
|
|
- }
|
|
|
- respItem := new(roadshow.ResearcherGroup)
|
|
|
- respItem.GroupName = k + "组"
|
|
|
- respItem.GroupId = mapPermissionId[k]
|
|
|
- respItem.ResearcherList = v
|
|
|
- group = append(group, respItem)
|
|
|
- }
|
|
|
+
|
|
|
+ for k, v := range mapPermissionUser {
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ respItem := new(roadshow.ResearcherGroup)
|
|
|
+ respItem.GroupName = k + "组"
|
|
|
+ respItem.GroupId = mapPermissionId[k]
|
|
|
+ respItem.ResearcherList = v
|
|
|
+ group = append(group, respItem)
|
|
|
}
|
|
|
+
|
|
|
}
|
|
|
groupMap := make(map[int][]*roadshow.ResearcherGroup)
|
|
|
for _, v := range researcherList {
|