Merge remote-tracking branch 'origin/eta/2.0.0' into eta/2.0.0

controllers/target.go

@@ -3577,8 +3577,13 @@ func (this *TargetController) ExcelDataAdd() {
 		return
 	}
 
+	userId := sysUser.AdminId
+	//超管账号可以查看分类下的所有频度数据
+	if sysUser.RoleTypeCode == utils.ROLE_TYPE_CODE_ADMIN {
+		userId = 0
+	}
 	//获取账户所拥有权限的分类id集合
-	classifyIdStrList, err := data.GetEdbClassifyListByAdminId(int64(sysUser.AdminId))
+	classifyIdStrList, err := data.GetEdbClassifyListByAdminId(int64(userId))
 	if err != nil {
 		br.Msg = "获取分类数据失败"
 		return