Merge branch 'crm/crm_16.0' of http://8.136.199.33:3000/hongze/hz_crm_api into debug

controllers/roadshow/report.go

@@ -118,6 +118,9 @@ func (this *CalendarController) ResearcherReportList() {
 		}
 		adminMap := make(map[int]*system.Admin, 0)
 		for _, v := range sysUserList {
+			if v.Enabled == 0 {
+				continue // 被禁用的不展示
+			}
 			adminMap[v.AdminId] = v
 		}
 
@@ -134,12 +137,17 @@ func (this *CalendarController) ResearcherReportList() {
 				researcherList = append(researcherList, item)
 			}
 		}
-		for k, v := range mapPermissionUser {
-			respItem := new(roadshow.ResearcherGroup)
-			respItem.GroupName = k + "组"
-			respItem.GroupId = mapPermissionId[k]
-			respItem.ResearcherList = v
-			group = append(group, respItem)
+		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)
+			}
 		}
 	}
 	groupMap := make(map[int][]*roadshow.ResearcherGroup)