Merge branch 'bzq/dev' of eta_mini/eta_mini_bridge into debug

controllers/report.go

@@ -377,8 +377,9 @@ func (this *ReportController) Detail() {
 
 	resp := new(response.ReportDetailResp)
 	if !IsPublic {
-		// 如果是私有报告，用户权限过期直接返回有效期已过
-		if vailStatus == 1 {
+		// 私有报告
+		// 用户权限过期或处于禁用状态，直接返回有效期已过
+		if vailStatus == 1 || user.Status == utils.UserStatusNo {
 			resp.Report = report
 			resp.Status = utils.ReportPermissionStatusExpired
 			report.Content = ""
@@ -387,8 +388,8 @@ func (this *ReportController) Detail() {
 			br.Msg = "用户权限不足"
 			return
 		}
-		// 如果被禁用或是潜在用户，直接返回无阅读报告权限
-		if user.Status == utils.UserStatusNo || user.Status == utils.UserStatusPotential {
+		// 潜在用户，直接返回无阅读报告权限
+		if user.Status == utils.UserStatusPotential {
 			resp.Report = report
 			resp.Status = utils.ReportPermissionStatusNo
 			report.Content = ""
@@ -397,6 +398,7 @@ func (this *ReportController) Detail() {
 			br.Msg = "用户权限不足"
 			return
 		}
+		// 正式用户，判断是否有权限查看
 		chartPermissionIds, err := models.GetChartPermissionIdByUserId(userId)
 		if err != nil {
 			br.Msg = "获取用户权限失败"
@@ -405,7 +407,7 @@ func (this *ReportController) Detail() {
 		}
 		if len(chartPermissionIds) <= 0 {
 			resp.Report = report
-			resp.Status = utils.ReportPermissionStatusNo
+			resp.Status = utils.ReportPermissionStatusNoPermission
 			report.Content = ""
 			br.Ret = 200
 			br.Data = resp
@@ -852,6 +854,9 @@ func (this *ReportNoAuthController) List() {
 			return
 		}
 		for _, v := range classifyList {
+			if v.HasChild == 1 {
+				continue
+			}
 			switch v.Level {
 			case 1:
 				classifyFirstIds = append(classifyFirstIds, v.Id)
@@ -917,6 +922,9 @@ func (this *ReportNoAuthController) List() {
 			return
 		}
 		for _, v := range classifyList {
+			if v.HasChild == 1 {
+				continue
+			}
 			switch v.Level {
 			case 1:
 				classifyFirstIds = append(classifyFirstIds, v.Id)