Merge branch 'eta/1.8.3' into debug

controllers/report_chapter.go

@@ -330,193 +330,100 @@ func (this *ReportController) EditDayWeekChapter() {
 // @Param	request	body models.EditReportChapterReq true "type json string"
 // @Success 200 Ret=200 保存成功
 // @router /chapter/del [post]
-//func (this *ReportController) DelChapter() {
-//	br := new(models.BaseResponse).Init()
-//	defer func() {
-//		this.Data["json"] = br
-//		this.ServeJSON()
-//	}()
-//
-//	sysUser := this.SysUser
-//	if sysUser == nil {
-//		br.Msg = "请登录"
-//		br.ErrMsg = "请登录，SysUser Is Empty"
-//		br.Ret = 408
-//		return
-//	}
-//
-//	var req models.DelReportChapterReq
-//	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
-//	if err != nil {
-//		br.Msg = "参数解析异常！"
-//		br.ErrMsg = "参数解析失败，Err:" + err.Error()
-//		return
-//	}
-//	reportChapterId := req.ReportChapterId
-//	if reportChapterId <= 0 {
-//		br.Msg = "报告章节ID有误"
-//		return
-//	}
-//	if req.Content == "" {
-//		br.Msg = "请输入内容"
-//		return
-//	}
-//
-//	// 获取章节详情
-//	reportChapterInfo, err := models.GetReportChapterInfoById(reportChapterId)
-//	if err != nil {
-//		br.Msg = "报告章节信息有误"
-//		br.ErrMsg = "报告章节信息有误, Err: " + err.Error()
-//		return
-//	}
-//
-//	// 获取报告详情
-//	reportInfo, err := models.GetReportByReportId(reportChapterInfo.ReportId)
-//	if err != nil {
-//		br.Msg = "报告信息有误"
-//		br.ErrMsg = "报告信息有误, Err: " + err.Error()
-//		return
-//	}
-//
-//	// 操作权限校验
-//	{
-//		// 如果不是创建人，那么就要去查看是否授权
-//		if reportInfo.AdminId != sysUser.AdminId {
-//			// 授权用户权限校验
-//			chapterGrantObj := report.ReportChapterGrant{}
-//			_, tmpErr := chapterGrantObj.GetGrantByIdAndAdmin(reportChapterInfo.ReportChapterId, sysUser.AdminId)
-//			if tmpErr != nil {
-//				if tmpErr.Error() == utils.ErrNoRow() {
-//					br.Msg = "没有权限"
-//					br.ErrMsg = "没有权限"
-//					br.IsSendEmail = false
-//					return
-//				}
-//				br.Msg = "获取章节id授权用户失败"
-//				br.ErrMsg = "获取章节id授权用户失败, Err: " + tmpErr.Error()
-//				return
-//			}
-//		}
-//
-//		// 标记更新中
-//		{
-//			markStatus, err := services.UpdateReportEditMark(reportChapterInfo.ReportId, reportChapterInfo.ReportChapterId, sysUser.AdminId, 1, sysUser.RealName, this.Lang)
-//			if err != nil {
-//				br.Msg = err.Error()
-//				return
-//			}
-//			if markStatus.Status == 1 {
-//				br.Msg = markStatus.Msg
-//				br.IsSendEmail = false
-//				return
-//			}
-//		}
-//	}
-//
-//	if reportInfo.State == 2 {
-//		br.Msg = "该报告已发布，不允许编辑"
-//		br.ErrMsg = "该报告已发布，不允许编辑"
-//		return
-//	}
-//
-//	reqTickerList := req.TickerList
-//	// 更新章节及指标
-//	contentSub := ""
-//	if req.Content != "" {
-//		e := utils.ContentXssCheck(req.Content)
-//		if e != nil {
-//			br.Msg = "存在非法标签"
-//			br.ErrMsg = "存在非法标签, Err: " + e.Error()
-//			return
-//		}
-//		contentClean, e := services.FilterReportContentBr(req.Content)
-//		if e != nil {
-//			br.Msg = "内容去除前后空格失败"
-//			br.ErrMsg = "内容去除前后空格失败, Err: " + e.Error()
-//			return
-//		}
-//		req.Content = contentClean
-//
-//		contentSub, err = services.GetReportContentSub(req.Content)
-//		if err != nil {
-//			br.Msg = "内容分段解析失败"
-//			br.ErrMsg = "编辑报告章节-解析 ContentSub 失败, Err: " + err.Error()
-//			return
-//		}
-//	}
-//
-//	reportChapterInfo.Title = req.Title
-//	//reportChapterInfo.AddType = req.AddType
-//	reportChapterInfo.Author = req.Author
-//	reportChapterInfo.Content = html.EscapeString(req.Content)
-//	reportChapterInfo.ContentSub = html.EscapeString(contentSub)
-//	reportChapterInfo.IsEdit = 1
-//	reportChapterInfo.CreateTime = req.CreateTime
-//	reportChapterInfo.VideoUrl = req.VideoUrl
-//	reportChapterInfo.VideoName = req.VideoName
-//	reportChapterInfo.VideoPlaySeconds = req.VideoPlaySeconds
-//	reportChapterInfo.VideoSize = req.VideoSize
-//	reportChapterInfo.VideoKind = 1
-//
-//	reportChapterInfo.LastModifyAdminId = sysUser.AdminId
-//	reportChapterInfo.LastModifyAdminName = sysUser.RealName
-//	reportChapterInfo.ContentModifyTime = time.Now()
-//	reportChapterInfo.ContentStruct = html.EscapeString(req.ContentStruct)
-//	reportChapterInfo.CanvasColor = req.CanvasColor
-//	reportChapterInfo.HeadResourceId = req.HeadResourceId
-//	reportChapterInfo.EndResourceId = req.EndResourceId
-//
-//	updateCols := make([]string, 0)
-//	updateCols = append(updateCols, "Title", "AddType", "Author", "Content", "ContentSub", "IsEdit", "CreateTime")
-//	if req.VideoUrl != "" {
-//		updateCols = append(updateCols, "VideoUrl", "VideoName", "VideoSize", "VideoPlaySeconds", "VideoKind")
-//	}
-//
-//	updateCols = append(updateCols, "LastModifyAdminId", "LastModifyAdminName", "ContentModifyTime", "ContentStruct", "CanvasColor", "HeadResourceId", "EndResourceId")
-//
-//	// 章节报告更新指标
-//	tickerList := make([]*models.ReportChapterTicker, 0)
-//	if len(reqTickerList) > 0 {
-//		nowTime := time.Now()
-//		for i := 0; i < len(reqTickerList); i++ {
-//			tickerList = append(tickerList, &models.ReportChapterTicker{
-//				ReportChapterId: reportChapterInfo.ReportChapterId,
-//				Sort:            reqTickerList[i].Sort,
-//				Ticker:          reqTickerList[i].Ticker,
-//				CreateTime:      nowTime,
-//				UpdateTime:      nowTime,
-//			})
-//		}
-//	}
-//	err = models.UpdateChapterAndTicker(reportChapterInfo, updateCols, tickerList)
-//	if err != nil {
-//		br.Msg = "保存失败"
-//		br.ErrMsg = "报告章节内容保存失败, Err: " + err.Error()
-//		return
-//	}
-//
-//	// 标记更新中
-//	{
-//		markStatus, err := services.UpdateReportEditMark(reportChapterInfo.ReportId, reportChapterInfo.ReportChapterId, sysUser.AdminId, 1, sysUser.RealName, this.Lang)
-//		if err != nil {
-//			br.Msg = err.Error()
-//			return
-//		}
-//		if markStatus.Status == 1 {
-//			br.Msg = markStatus.Msg
-//			return
-//		}
-//	}
-//
-//	// 备份关键数据
-//	chapters := make([]*models.ReportChapter, 0)
-//	chapters = append(chapters, reportChapterInfo)
-//	go services.SaveReportLogs(nil, chapters, sysUser.AdminId, sysUser.RealName)
-//
-//	br.Ret = 200
-//	br.Success = true
-//	br.Msg = "保存成功"
-//}
+func (this *ReportController) DelChapter() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+
+	sysUser := this.SysUser
+	if sysUser == nil {
+		br.Msg = "请登录"
+		br.ErrMsg = "请登录，SysUser Is Empty"
+		br.Ret = 408
+		return
+	}
+
+	var req models.DelReportChapterReq
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
+	if err != nil {
+		br.Msg = "参数解析异常！"
+		br.ErrMsg = "参数解析失败，Err:" + err.Error()
+		return
+	}
+	reportChapterId := req.ReportChapterId
+	if reportChapterId <= 0 {
+		br.Msg = "报告章节ID有误"
+		return
+	}
+
+	// 获取章节详情
+	reportChapterInfo, err := models.GetReportChapterInfoById(reportChapterId)
+	if err != nil {
+		br.Msg = "报告章节信息有误"
+		br.ErrMsg = "报告章节信息有误, Err: " + err.Error()
+		return
+	}
+
+	// 获取报告详情
+	reportInfo, err := models.GetReportByReportId(reportChapterInfo.ReportId)
+	if err != nil {
+		br.Msg = "报告信息有误"
+		br.ErrMsg = "报告信息有误, Err: " + err.Error()
+		return
+	}
+
+	// 操作权限校验
+	{
+		// 如果不是创建人，那么就要去查看是否授权
+		if reportInfo.AdminId != sysUser.AdminId {
+			// 授权用户权限校验
+			chapterGrantObj := report.ReportChapterGrant{}
+			_, tmpErr := chapterGrantObj.GetGrantByIdAndAdmin(reportChapterInfo.ReportChapterId, sysUser.AdminId)
+			if tmpErr != nil {
+				if tmpErr.Error() == utils.ErrNoRow() {
+					br.Msg = "没有权限"
+					br.ErrMsg = "没有权限"
+					br.IsSendEmail = false
+					return
+				}
+				br.Msg = "获取章节id授权用户失败"
+				br.ErrMsg = "获取章节id授权用户失败, Err: " + tmpErr.Error()
+				return
+			}
+		}
+
+		// 标记更新中
+		{
+			markStatus, err := services.UpdateReportEditMark(reportChapterInfo.ReportId, reportChapterInfo.ReportChapterId, sysUser.AdminId, 1, sysUser.RealName, this.Lang)
+			if err != nil {
+				br.Msg = err.Error()
+				return
+			}
+			if markStatus.Status == 1 {
+				br.Msg = markStatus.Msg
+				br.IsSendEmail = false
+				return
+			}
+		}
+	}
+
+	if reportInfo.State == 2 {
+		br.Msg = "该报告已发布，不允许编辑"
+		br.ErrMsg = "该报告已发布，不允许编辑"
+		return
+	}
+
+	// 备份关键数据
+	chapters := make([]*models.ReportChapter, 0)
+	chapters = append(chapters, reportChapterInfo)
+	go services.SaveReportLogs(nil, chapters, sysUser.AdminId, sysUser.RealName)
+
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "删除成功"
+}
 
 // EditChapterBaseInfoAndPermission
 // @Title 修改报告章节的基础信息、授权用户权限、品种权限

controllers/report_v2.go

@@ -1029,7 +1029,7 @@ func (this *ReportController) PublishDayWeekReportChapter() {
 // @Description 获取有权限的报告列表接口
 // @Param   PageSize   query   int  true       "每页数据条数"
 // @Param   CurrentIndex   query   int  true       "当前页页码，从1开始"
-// @Param   KeyWord   query   string  true       "搜索关键词"
+// @Param   Keyword   query   string  true       "搜索关键词"
 // @Param   ClassifyIdFirst   query   int  true       "一级分类id"
 // @Param   ClassifyIdSecond   query   int  true       "二级分类id"
 // @Param   ClassifyIdThird   query   int  true       "三级分类id"
@@ -1043,7 +1043,7 @@ func (this *ReportController) AuthorizedListReport() {
 	}()
 	pageSize, _ := this.GetInt("PageSize")
 	currentIndex, _ := this.GetInt("CurrentIndex")
-	keyword := this.GetString("KeyWord")
+	keyword := this.GetString("Keyword")
 	classifyIdFirst, _ := this.GetInt("ClassifyIdFirst", 0)
 	classifyIdSecond, _ := this.GetInt("ClassifyIdSecond", 0)
 	classifyIdThird, _ := this.GetInt("ClassifyIdThird", 0)
@@ -1059,17 +1059,17 @@ func (this *ReportController) AuthorizedListReport() {
 	var list []*models.ReportList
 
 	// 没有输入信息，那就不展示
-	if keyword == `` {
-		page := paging.GetPaging(currentIndex, pageSize, 0)
-		resp := new(models.ReportListResp)
-		resp.Paging = page
-		resp.List = list
-		br.Ret = 200
-		br.Success = true
-		br.Msg = "获取成功"
-		br.Data = resp
-		return
-	}
+	//if keyword == `` {
+	//	page := paging.GetPaging(currentIndex, pageSize, 0)
+	//	resp := new(models.ReportListResp)
+	//	resp.Paging = page
+	//	resp.List = list
+	//	br.Ret = 200
+	//	br.Success = true
+	//	br.Msg = "获取成功"
+	//	br.Data = resp
+	//	return
+	//}
 
 	// 当前用户有权限的报告id列表
 	grantReportIdList := make([]int, 0)
@@ -1089,9 +1089,6 @@ func (this *ReportController) AuthorizedListReport() {
 	var condition string
 	var pars []interface{}
 
-	condition += ` AND a.title LIKE ? `
-	pars = utils.GetLikeKeywordPars(pars, keyword, 1)
-
 	if classifyIdFirst > 0 {
 		condition += ` AND a.classify_id_first = ? `
 		pars = append(pars, classifyIdFirst)
@@ -1105,6 +1102,11 @@ func (this *ReportController) AuthorizedListReport() {
 		pars = append(pars, classifyIdSecond)
 	}
 
+	if keyword != `` {
+		condition += ` AND a.title LIKE ? `
+		pars = utils.GetLikeKeywordPars(pars, keyword, 1)
+	}
+
 	var err error
 	var total int
 

services/report.go

@@ -1710,202 +1710,182 @@ func EditChapterBaseInfoAndPermission(reportInfo *models.Report, reportChapterIn
 // @param adminIdList []int
 // @return err error
 // @return errMsg string
-func DelChapter(reportInfo *models.Report, reportChapterInfo *models.ReportChapter, title string, permissionIdList []int, adminIdList []int) (err error, errMsg string) {
-	errMsg = "删除失败"
-
-	if reportInfo.State == 2 {
-		errMsg = "该报告已发布，不允许删除"
-		err = errors.New(errMsg)
-		return
-	}
-
-	updateCols := make([]string, 0)
-	// 如果标题内容，那么就修改
-	if title != `` {
-		reportChapterInfo.Title = title
-		reportChapterInfo.ModifyTime = time.Now()
-		updateCols = append(updateCols, "Title", "ModifyTime")
-		reportChapterInfo.UpdateChapter(updateCols)
-	}
-
-	reportGrantObj := report.ReportGrant{}
-	chapterGrantObj := report.ReportChapterGrant{}
-	chapterPermissionObj := report.ReportChapterPermissionMapping{}
-
-	// 需要添加的报告章节授权数据
-	addChapterAdminList := make([]*report.ReportChapterGrant, 0)
-	// 待移除的报告章节授权数据id
-	delReportChapterGrantIdList := make([]int, 0)
-
-	// 处理当前报告章节需要新增/移除的授权信息
-	{
-		// 获取当前章节已经授权的用户信息
-		chapterGrantList, tmpErr := chapterGrantObj.GetGrantListById(reportChapterInfo.ReportChapterId)
-		if tmpErr != nil {
-			err = tmpErr
-			return
-		}
-
-		// 当前章节已经授权的用户信息
-		currChapterAdminMap := make(map[int]*report.ReportChapterGrant)
-		// 需要删除的报告章节授权数据
-		delChapterAdminMap := make(map[int]*report.ReportChapterGrant)
-		for _, v := range chapterGrantList {
-			currChapterAdminMap[v.AdminId] = v
-			delChapterAdminMap[v.AdminId] = v
-		}
-
-		for _, adminId := range adminIdList {
-			_, ok := currChapterAdminMap[adminId]
-			// 如果存在，那么从 “需要删除的报告章节授权数据” 的map中移除
-			if ok {
-				delete(delChapterAdminMap, adminId)
-				continue
-			}
-			// 如果不存在，那么就新增授权
-			addChapterAdminList = append(addChapterAdminList, &report.ReportChapterGrant{
-				//GrantId:         0,
-				ReportChapterId: reportChapterInfo.ReportChapterId,
-				AdminId:         adminId,
-				CreateTime:      time.Now(),
-			})
-		}
-
-		// 查出需要移除的授权id
-		for _, v := range delChapterAdminMap {
-			delReportChapterGrantIdList = append(delReportChapterGrantIdList, v.GrantId)
-		}
-	}
-
-	// 其他章节授权的用户
-	otherChapterAdminMap := make(map[int]bool)
-	{
-		// 获取报告所有的章节id
-		reportChapterIdList, tmpErr := models.GetReportChapterIdList(reportInfo.Id)
-		if tmpErr != nil {
-			err = tmpErr
-			return
-		}
-
-		if len(reportChapterIdList) > 0 {
-			list, tmpErr := chapterGrantObj.GetGrantListByIdList(reportChapterIdList)
-			if tmpErr != nil {
-				err = tmpErr
-				return
-			}
-			for _, v := range list {
-				// 如果是当前章节，因为涉及到重新授权，所以得过滤
-				if v.ReportChapterId == reportChapterInfo.ReportChapterId {
-					continue
-				}
-				otherChapterAdminMap[v.AdminId] = true
-			}
-		}
-	}
-
-	// 需要添加的报告授权数据
-	addReportAdminList := make([]*report.ReportGrant, 0)
-	// 待移除的报告授权数据id
-	delReportGrantIdList := make([]int, 0)
-
-	// 处理当前报告需要新增/移除的授权信息
-	{
-		// 获取当前报告已经授权的用户信息
-		reportGrantList, tmpErr := reportGrantObj.GetGrantListById(reportInfo.Id)
-		if tmpErr != nil {
-			err = tmpErr
-			return
-		}
-
-		// 当前报告已经授权的用户信息
-		currReportAdminMap := make(map[int]*report.ReportGrant)
-		// 需要删除的报告授权数据
-		delReportAdminMap := make(map[int]*report.ReportGrant)
-		for _, v := range reportGrantList {
-			currReportAdminMap[v.AdminId] = v
-			delReportAdminMap[v.AdminId] = v
-		}
-
-		// 先看需要新增哪些用户
-		for _, tmpAdminId := range adminIdList {
-			_, ok := currReportAdminMap[tmpAdminId]
-			// 如果章节中需要新增的用户 已经在 报告授权用户里面，那么就忽略，可以不用新增了
-			if ok {
-				delete(delReportAdminMap, tmpAdminId)
-				continue
-			}
-
-			// 如果不存在，那么就新增授权
-			addReportAdminList = append(addReportAdminList, &report.ReportGrant{
-				//GrantId:         0,
-				ReportId:   reportInfo.Id,
-				AdminId:    tmpAdminId,
-				CreateTime: time.Now(),
-			})
-		}
-
-		// 再看看章节中，需要移除的用户
-		for _, tmpAdminId := range delReportChapterGrantIdList {
-			_, ok := otherChapterAdminMap[tmpAdminId]
-			// 如果章节中需要移除的用户 在 报告中其他章节的授权用户里面，那么就忽略，可以不用删除了
-			if ok {
-				delete(delReportAdminMap, tmpAdminId)
-				continue
-			}
-		}
-
-		// 查出需要移除的授权id
-		for _, v := range delReportAdminMap {
-			delReportGrantIdList = append(delReportGrantIdList, v.GrantId)
-		}
-	}
-
-	// 需要添加的报告章节品种权限数据
-	addChapterPermissionList := make([]*report.ReportChapterPermissionMapping, 0)
-	// 待移除的报告章节品种权限数据id
-	delChapterPermissionMappingIdList := make([]int, 0)
-
-	// 处理当前报告章节需要新增/移除的品种权限信息
-	{
-		// 获取当前章节已经配置的品种权限信息
-		chapterPermissionList, tmpErr := chapterPermissionObj.GetPermissionListById(reportChapterInfo.ReportChapterId)
-		if tmpErr != nil {
-			err = tmpErr
-			return
-		}
-
-		// 当前章节已经配置的品种权限信息
-		currChapterPermissionMap := make(map[int]*report.ReportChapterPermissionMapping)
-		// 需要删除的报告章节品种权限配置
-		delChapterPermissionMap := make(map[int]*report.ReportChapterPermissionMapping)
-		for _, v := range chapterPermissionList {
-			currChapterPermissionMap[v.ChartPermissionId] = v
-			delChapterPermissionMap[v.ChartPermissionId] = v
-		}
-
-		for _, permissionId := range permissionIdList {
-			_, ok := currChapterPermissionMap[permissionId]
-			// 如果存在，那么从 “需要删除的报告章节品种权限配置” 的map中移除
-			if ok {
-				delete(delChapterPermissionMap, permissionId)
-				continue
-			}
-			// 如果不存在，那么就新增品种权限配置
-			addChapterPermissionList = append(addChapterPermissionList, &report.ReportChapterPermissionMapping{
-				//ReportChapterPermissionMappingId:         0,
-				ReportChapterId:   reportChapterInfo.ReportChapterId,
-				ChartPermissionId: permissionId,
-				CreateTime:        time.Now(),
-			})
-		}
-
-		// 查出需要移除的品种权限配置
-		for _, v := range delChapterPermissionMap {
-			delChapterPermissionMappingIdList = append(delChapterPermissionMappingIdList, v.ReportChapterPermissionMappingId)
-		}
-	}
-
-	err = models.EditChapterBaseInfoAndPermission(reportChapterInfo, updateCols, addReportAdminList, addChapterAdminList, addChapterPermissionList, delReportGrantIdList, delReportChapterGrantIdList, delChapterPermissionMappingIdList)
-
-	return
-}
+//func DelChapter(reportInfo *models.Report, reportChapterInfo *models.ReportChapter, title string, permissionIdList []int, adminIdList []int) (err error, errMsg string) {
+//	errMsg = "删除失败"
+//
+//	if reportInfo.State == 2 {
+//		errMsg = "该报告已发布，不允许删除"
+//		err = errors.New(errMsg)
+//		return
+//	}
+//
+//	updateCols := make([]string, 0)
+//	// 如果标题内容，那么就修改
+//	if title != `` {
+//		reportChapterInfo.Title = title
+//		reportChapterInfo.ModifyTime = time.Now()
+//		updateCols = append(updateCols, "Title", "ModifyTime")
+//		reportChapterInfo.UpdateChapter(updateCols)
+//	}
+//
+//	reportGrantObj := report.ReportGrant{}
+//	chapterGrantObj := report.ReportChapterGrant{}
+//	chapterPermissionObj := report.ReportChapterPermissionMapping{}
+//
+//	// 需要添加的报告章节授权数据
+//	addChapterAdminList := make([]*report.ReportChapterGrant, 0)
+//	// 待移除的报告章节授权数据id
+//	delReportChapterGrantIdList := make([]int, 0)
+//
+//	// 处理当前报告章节需要新增/移除的授权信息
+//	{
+//		// 获取当前章节已经授权的用户信息
+//		chapterGrantList, tmpErr := chapterGrantObj.GetGrantListById(reportChapterInfo.ReportChapterId)
+//		if tmpErr != nil {
+//			err = tmpErr
+//			return
+//		}
+//
+//		// 当前章节已经授权的用户信息
+//		currChapterAdminMap := make(map[int]*report.ReportChapterGrant)
+//		// 需要删除的报告章节授权数据
+//		delChapterAdminMap := make(map[int]*report.ReportChapterGrant)
+//		for _, v := range chapterGrantList {
+//			currChapterAdminMap[v.AdminId] = v
+//			delChapterAdminMap[v.AdminId] = v
+//		}
+//
+//		for _, adminId := range adminIdList {
+//			_, ok := currChapterAdminMap[adminId]
+//			// 如果存在，那么从 “需要删除的报告章节授权数据” 的map中移除
+//			if ok {
+//				delete(delChapterAdminMap, adminId)
+//				continue
+//			}
+//			// 如果不存在，那么就新增授权
+//			addChapterAdminList = append(addChapterAdminList, &report.ReportChapterGrant{
+//				//GrantId:         0,
+//				ReportChapterId: reportChapterInfo.ReportChapterId,
+//				AdminId:         adminId,
+//				CreateTime:      time.Now(),
+//			})
+//		}
+//
+//		// 查出需要移除的授权id
+//		for _, v := range delChapterAdminMap {
+//			delReportChapterGrantIdList = append(delReportChapterGrantIdList, v.GrantId)
+//		}
+//	}
+//
+//	// 其他章节授权的用户
+//	otherChapterAdminMap := make(map[int]bool)
+//	{
+//		// 获取报告所有的章节id
+//		reportChapterIdList, tmpErr := models.GetReportChapterIdList(reportInfo.Id)
+//		if tmpErr != nil {
+//			err = tmpErr
+//			return
+//		}
+//
+//		if len(reportChapterIdList) > 0 {
+//			list, tmpErr := chapterGrantObj.GetGrantListByIdList(reportChapterIdList)
+//			if tmpErr != nil {
+//				err = tmpErr
+//				return
+//			}
+//			for _, v := range list {
+//				// 如果是当前章节，因为涉及到重新授权，所以得过滤
+//				if v.ReportChapterId == reportChapterInfo.ReportChapterId {
+//					continue
+//				}
+//				otherChapterAdminMap[v.AdminId] = true
+//			}
+//		}
+//	}
+//
+//	// 待移除的报告授权数据id
+//	delReportGrantIdList := make([]int, 0)
+//
+//	// 处理当前报告需要新增/移除的授权信息
+//	{
+//		// 获取当前报告已经授权的用户信息
+//		reportGrantList, tmpErr := reportGrantObj.GetGrantListById(reportInfo.Id)
+//		if tmpErr != nil {
+//			err = tmpErr
+//			return
+//		}
+//
+//		// 当前报告已经授权的用户信息
+//		currReportAdminMap := make(map[int]*report.ReportGrant)
+//		// 需要删除的报告授权数据
+//		delReportAdminMap := make(map[int]*report.ReportGrant)
+//		for _, v := range reportGrantList {
+//			currReportAdminMap[v.AdminId] = v
+//			delReportAdminMap[v.AdminId] = v
+//		}
+//
+//		// 再看看章节中，需要移除的用户
+//		for _, tmpAdminId := range delReportChapterGrantIdList {
+//			_, ok := otherChapterAdminMap[tmpAdminId]
+//			// 如果章节中需要移除的用户 在 报告中其他章节的授权用户里面，那么就忽略，可以不用删除了
+//			if ok {
+//				delete(delReportAdminMap, tmpAdminId)
+//				continue
+//			}
+//		}
+//
+//		// 查出需要移除的授权id
+//		for _, v := range delReportAdminMap {
+//			delReportGrantIdList = append(delReportGrantIdList, v.GrantId)
+//		}
+//	}
+//
+//	// 需要添加的报告章节品种权限数据
+//	addChapterPermissionList := make([]*report.ReportChapterPermissionMapping, 0)
+//	// 待移除的报告章节品种权限数据id
+//	delChapterPermissionMappingIdList := make([]int, 0)
+//
+//	// 处理当前报告章节需要新增/移除的品种权限信息
+//	{
+//		// 获取当前章节已经配置的品种权限信息
+//		chapterPermissionList, tmpErr := chapterPermissionObj.GetPermissionListById(reportChapterInfo.ReportChapterId)
+//		if tmpErr != nil {
+//			err = tmpErr
+//			return
+//		}
+//
+//		// 当前章节已经配置的品种权限信息
+//		currChapterPermissionMap := make(map[int]*report.ReportChapterPermissionMapping)
+//		// 需要删除的报告章节品种权限配置
+//		delChapterPermissionMap := make(map[int]*report.ReportChapterPermissionMapping)
+//		for _, v := range chapterPermissionList {
+//			currChapterPermissionMap[v.ChartPermissionId] = v
+//			delChapterPermissionMap[v.ChartPermissionId] = v
+//		}
+//
+//		for _, permissionId := range permissionIdList {
+//			_, ok := currChapterPermissionMap[permissionId]
+//			// 如果存在，那么从 “需要删除的报告章节品种权限配置” 的map中移除
+//			if ok {
+//				delete(delChapterPermissionMap, permissionId)
+//				continue
+//			}
+//			// 如果不存在，那么就新增品种权限配置
+//			addChapterPermissionList = append(addChapterPermissionList, &report.ReportChapterPermissionMapping{
+//				//ReportChapterPermissionMappingId:         0,
+//				ReportChapterId:   reportChapterInfo.ReportChapterId,
+//				ChartPermissionId: permissionId,
+//				CreateTime:        time.Now(),
+//			})
+//		}
+//
+//		// 查出需要移除的品种权限配置
+//		for _, v := range delChapterPermissionMap {
+//			delChapterPermissionMappingIdList = append(delChapterPermissionMappingIdList, v.ReportChapterPermissionMappingId)
+//		}
+//	}
+//
+//	err = models.EditChapterBaseInfoAndPermission(reportChapterInfo, updateCols, addReportAdminList, addChapterAdminList, addChapterPermissionList, delReportGrantIdList, delReportChapterGrantIdList, delChapterPermissionMappingIdList)
+//
+//	return
+//}