fix

controllers/data_manage/chart_public.go

@@ -15,14 +15,14 @@ import (
 	"strings"
 )
 
-// ChartPublicController 公共指标
+// ChartPublicController 公共图表
 type ChartPublicController struct {
 	controllers.BaseAuthController
 }
 
 // Save
-// @Title 单个指标设置公开
-// @Description 单个指标设置公开
+// @Title 单个图表设置公开
+// @Description 单个图表设置公开
 // @Param	request	body request.SetChartInfoShareReq true "type json string"
 // @Success 200 {object} data_manage.ChartInfo
 // @router /chart_info/public/save [post]
@@ -49,7 +49,7 @@ func (c *ChartPublicController) Save() {
 	}
 
 	if len(req.ChartInfoList) <= 0 {
-		br.Msg = `请选择指标`
+		br.Msg = `请选择图表`
 		br.IsSendEmail = false
 		return
 	}
@@ -57,7 +57,7 @@ func (c *ChartPublicController) Save() {
 	// 待处理的资产
 	dataPublicItemList := make([]dataApproveSerice.SetDataPublicItem, 0)
 
-	// 校验是否重复存在已公开、已提交的指标
+	// 校验是否重复存在已公开、已提交的图表
 	{
 		chartInfoIdList := make([]int, 0)
 		for _, item := range req.ChartInfoList {
@@ -72,12 +72,12 @@ func (c *ChartPublicController) Save() {
 		list, err := data_manage.GetChartInfoByIdList(chartInfoIdList)
 		if err != nil {
 			br.Msg = "保存失败！"
-			br.ErrMsg = "获取指标数据失败，Err:" + err.Error()
+			br.ErrMsg = "获取图表数据失败，Err:" + err.Error()
 			return
 		}
 		for _, v := range list {
 			if v.PublicStatus != utils.DataPublicDefault {
-				br.Msg = `选择指标中存在已经公开/提交审批的指标，请仅选择未公开指标！`
+				br.Msg = `选择图表中存在已经公开/提交审批的图表，请仅选择未公开图表！`
 				br.IsSendEmail = false
 				return
 			}
@@ -88,7 +88,7 @@ func (c *ChartPublicController) Save() {
 	opening, e := dataApproveSerice.CheckOpenApprove(utils.DataApproveTypeChart)
 	if e != nil {
 		br.Msg = "操作失败"
-		br.ErrMsg = "校验指标公开是否开启审批流失败, Err: " + e.Error()
+		br.ErrMsg = "校验图表公开是否开启审批流失败, Err: " + e.Error()
 		return
 	}
 
@@ -109,13 +109,13 @@ func (c *ChartPublicController) Save() {
 
 	chartInfo, err := data_manage.GetChartInfoById(req.ChartInfoList[0].ChartInfoId)
 	if err != nil {
-		br.Msg = "获取指标失败"
-		br.ErrMsg = "获取指标失败：" + err.Error()
+		br.Msg = "获取图表失败"
+		br.ErrMsg = "获取图表失败：" + err.Error()
 		return
 	}
 	title := chartInfo.ChartName
 	if len(req.ChartInfoList) > 1 {
-		title += `等指标`
+		title += `等图表`
 	}
 	title += `公开审批`
 
@@ -147,9 +147,9 @@ func (c *ChartPublicController) Save() {
 }
 
 // Cancel
-// @Title 撤销指标公开
-// @Description 撤销指标公开
-// @Param   ChartInfoId   query   int  true       "指标id"
+// @Title 撤销图表公开
+// @Description 撤销图表公开
+// @Param   ChartInfoId   query   int  true       "图表id"
 // @Success 200 {object} data_manage.ChartInfo
 // @router /chart_info/public/cancel [post]
 func (c *ChartPublicController) Cancel() {
@@ -159,7 +159,7 @@ func (c *ChartPublicController) Cancel() {
 		c.ServeJSON()
 	}()
 
-	// TODO 单个指标撤销的时候，需要校验状态，然后撤销
+	// TODO 单个图表撤销的时候，需要校验状态，然后撤销
 	sysUser := c.SysUser
 	if sysUser == nil {
 		br.Msg = "请登录"
@@ -184,7 +184,7 @@ func (c *ChartPublicController) Cancel() {
 	}
 
 	if len(req.ChartInfoList) <= 0 {
-		br.Msg = `请选择指标`
+		br.Msg = `请选择图表`
 		br.IsSendEmail = false
 		return
 	}
@@ -192,7 +192,7 @@ func (c *ChartPublicController) Cancel() {
 	// 待处理的资产
 	dataPublicItemList := make([]dataApproveSerice.SetDataPublicItem, 0)
 
-	// 校验是否重复存在已公开、已提交的指标
+	// 校验是否重复存在已公开、已提交的图表
 	{
 		chartInfoIdList := make([]int, 0)
 		for _, item := range req.ChartInfoList {
@@ -207,12 +207,12 @@ func (c *ChartPublicController) Cancel() {
 		list, err := data_manage.GetChartInfoByIdList(chartInfoIdList)
 		if err != nil {
 			br.Msg = "保存失败！"
-			br.ErrMsg = "获取指标数据失败，Err:" + err.Error()
+			br.ErrMsg = "获取图表数据失败，Err:" + err.Error()
 			return
 		}
 		for _, v := range list {
 			if v.PublicStatus != utils.DataPublicDefault {
-				br.Msg = `选择指标中存在已经公开/提交审批的指标，请仅选择未公开指标！`
+				br.Msg = `选择图表中存在已经公开/提交审批的图表，请仅选择未公开图表！`
 				br.IsSendEmail = false
 				return
 			}
@@ -224,8 +224,8 @@ func (c *ChartPublicController) Cancel() {
 }
 
 // ListByEs
-// @Title 指标筛选接口
-// @Description 指标筛选接口
+// @Title 图表筛选接口
+// @Description 图表筛选接口
 // @Success 200 {object} data_manage.ChartInfoList
 // @Param	request	body request.SearchPublicChartReq true "type json string"
 // @Success 200 {object} data_manage.ChartInfoFilterDataResp
@@ -269,7 +269,7 @@ func (c *ChartPublicController) ListByEs() {
 
 	page := paging.GetPaging(currentIndex, pageSize, int(total))
 
-	// 因为是ES查找的，所以需要重新查一下指标的信息，主要是为了把是否授权字段找出来
+	// 因为是ES查找的，所以需要重新查一下图表的信息，主要是为了把是否授权字段找出来
 	if len(chartInfoList) > 0 {
 		chartInfoIdList := make([]int, 0)
 		for _, v := range chartInfoList {
@@ -281,7 +281,7 @@ func (c *ChartPublicController) ListByEs() {
 		tmpChartList, err := data_manage.GetChartInfoByIdList(chartInfoIdList)
 		if err != nil {
 			br.Msg = "获取失败"
-			br.ErrMsg = "获取所有有权限的指标失败，Err:" + err.Error()
+			br.ErrMsg = "获取所有有权限的图表失败，Err:" + err.Error()
 			return
 		}
 		chartInfoMap := make(map[int]*data_manage.ChartInfo)
@@ -309,8 +309,8 @@ func (c *ChartPublicController) ListByEs() {
 }
 
 // AllListByEs
-// @Title 指标筛选接口
-// @Description 指标筛选接口
+// @Title 图表筛选接口
+// @Description 图表筛选接口
 // @Success 200 {object} data_manage.ChartInfoList
 // @Param	request	body request.SearchChartInfoShareReq true "type json string"
 // @Success 200 {object} data_manage.ChartInfoFilterDataResp
@@ -329,21 +329,21 @@ func (c *ChartPublicController) AllListByEs() {
 		br.ErrMsg = "参数解析失败，Err:" + err.Error()
 		return
 	}
-	// 选择所有指标，所以需要通过es获取数据
+	// 选择所有图表，所以需要通过es获取数据
 
-	// 选中的指标id列表
+	// 选中的图表id列表
 	chartInfoList := make([]*data_manage.ChartInfoView, 0)
 
-	// 选择所有指标，所以需要通过es获取数据
+	// 选择所有图表，所以需要通过es获取数据
 	if req.IsSelectAll {
 		tmpChartInfoList, err := data.GetAllChartInfoListBySearchPublicChartReq(req.SearchPublicChartReq, c.SysUser.AdminId)
 		if err != nil {
-			br.Msg = "获取指标列表失败！"
-			br.ErrMsg = "获取指标列表失败，Err:" + err.Error()
+			br.Msg = "获取图表列表失败！"
+			br.ErrMsg = "获取图表列表失败，Err:" + err.Error()
 			return
 		}
 
-		// 如果有过滤指标，那么就过滤吧
+		// 如果有过滤图表，那么就过滤吧
 		if len(req.NoChartIdList) > 0 {
 			noChartIdMap := make(map[int]bool)
 			for _, v := range req.NoChartIdList {
@@ -352,7 +352,7 @@ func (c *ChartPublicController) AllListByEs() {
 
 			for _, v := range tmpChartInfoList {
 				if _, ok := noChartIdMap[v.ChartInfoId]; !ok {
-					// 如果不在未选中的指标id列表中，那么就加入到选中的指标id列表
+					// 如果不在未选中的图表id列表中，那么就加入到选中的图表id列表
 					chartInfoList = append(chartInfoList, v)
 				}
 			}
@@ -360,7 +360,7 @@ func (c *ChartPublicController) AllListByEs() {
 			chartInfoList = tmpChartInfoList
 		}
 
-		// 因为是ES查找的，所以需要重新查一下指标的信息，主要是为了把是否授权字段找出来
+		// 因为是ES查找的，所以需要重新查一下图表的信息，主要是为了把是否授权字段找出来
 		if len(chartInfoList) > 0 {
 
 			chartInfoIdList := make([]int, 0)
@@ -373,7 +373,7 @@ func (c *ChartPublicController) AllListByEs() {
 			tmpChartList, err := data_manage.GetChartInfoByIdList(chartInfoIdList)
 			if err != nil {
 				br.Msg = "获取失败"
-				br.ErrMsg = "获取所有有权限的指标失败，Err:" + err.Error()
+				br.ErrMsg = "获取所有有权限的图表失败，Err:" + err.Error()
 				return
 			}
 			chartInfoMap := make(map[int]*data_manage.ChartInfo)
@@ -390,12 +390,12 @@ func (c *ChartPublicController) AllListByEs() {
 			}
 		}
 	} else {
-		// 因为是ES查找的，所以需要重新查一下指标的信息，主要是为了把是否授权字段找出来
+		// 因为是ES查找的，所以需要重新查一下图表的信息，主要是为了把是否授权字段找出来
 		if len(req.ChartIdList) > 0 {
 			chartInfoList, err = data_manage.GetChartInfoViewByIdList(req.ChartIdList)
 			if err != nil {
 				br.Msg = "获取失败"
-				br.ErrMsg = "获取所有有权限的指标失败，Err:" + err.Error()
+				br.ErrMsg = "获取所有有权限的图表失败，Err:" + err.Error()
 				return
 			}
 		}
@@ -411,8 +411,8 @@ func (c *ChartPublicController) AllListByEs() {
 }
 
 // BatchMoveChart
-// @Title 指标批量移动接口
-// @Description 指标批量移动接口
+// @Title 图表批量移动接口
+// @Description 图表批量移动接口
 // @Param	request	body request.MoveChartClassifyReq true "type json string"
 // @Success Ret=200 移动成功
 // @router /chart_info/public/batch_move [post]
@@ -453,14 +453,14 @@ func (c *ChartPublicController) BatchMoveChart() {
 
 	chartInfoIdList := make([]int, 0)
 	if req.IsSelectAll {
-		// 获取指标
+		// 获取图表
 		chartInfoList, err := data.GetAllChartInfoListBySearchPublicChartReq(req.SearchPublicChartReq, c.SysUser.AdminId)
 		if err != nil {
-			br.Msg = "获取指标列表失败！"
-			br.ErrMsg = "获取指标列表失败，Err:" + err.Error()
+			br.Msg = "获取图表列表失败！"
+			br.ErrMsg = "获取图表列表失败，Err:" + err.Error()
 			return
 		}
-		// 如果有过滤指标，那么就过滤吧
+		// 如果有过滤图表，那么就过滤吧
 		if len(req.NoChartIdList) > 0 {
 			noChartIdMap := make(map[int]bool)
 			for _, v := range req.NoChartIdList {
@@ -470,19 +470,19 @@ func (c *ChartPublicController) BatchMoveChart() {
 			for _, chartInfo := range chartInfoList {
 				if _, ok := noChartIdMap[chartInfo.ChartInfoId]; !ok {
 					if chartInfo.PublicStatus != utils.DataPublicSuccess {
-						br.Msg = `存在未公开的指标：` + chartInfo.ChartName
+						br.Msg = `存在未公开的图表：` + chartInfo.ChartName
 						br.IsSendEmail = false
 						return
 					}
 
-					// 如果不在未选中的指标id列表中，那么就加入到选中的指标id列表
+					// 如果不在未选中的图表id列表中，那么就加入到选中的图表id列表
 					chartInfoIdList = append(chartInfoIdList, chartInfo.ChartInfoId)
 				}
 			}
 		} else {
 			for _, chartInfo := range chartInfoList {
 				if chartInfo.PublicStatus != utils.DataPublicSuccess {
-					br.Msg = `存在未公开的指标：` + chartInfo.ChartName
+					br.Msg = `存在未公开的图表：` + chartInfo.ChartName
 					br.IsSendEmail = false
 					return
 				}
@@ -493,12 +493,12 @@ func (c *ChartPublicController) BatchMoveChart() {
 		chartInfoList, err := data_manage.GetChartInfoViewByIdList(req.ChartIdList)
 		if err != nil {
 			br.Msg = "获取失败"
-			br.ErrMsg = "获取所有有权限的指标失败，Err:" + err.Error()
+			br.ErrMsg = "获取所有有权限的图表失败，Err:" + err.Error()
 			return
 		}
 		for _, v := range chartInfoList {
 			if v.PublicStatus != utils.DataPublicSuccess {
-				br.Msg = `存在未公开的指标：` + v.ChartName
+				br.Msg = `存在未公开的图表：` + v.ChartName
 				br.IsSendEmail = false
 				return
 			}
@@ -508,22 +508,22 @@ func (c *ChartPublicController) BatchMoveChart() {
 
 	num := len(chartInfoIdList)
 	if num <= 0 {
-		br.Msg = `请选择要移动的指标！`
+		br.Msg = `请选择要移动的图表！`
 		br.IsSendEmail = false
 		return
 	}
 	if num > 100 {
-		br.Msg = `最多只能选择100条指标！`
+		br.Msg = `最多只能选择100条图表！`
 		br.IsSendEmail = false
 		return
 	}
 
-	// 开始批量修改指标分类
+	// 开始批量修改图表分类
 	if len(chartInfoIdList) > 0 {
 		err = data_manage.UpdatePublicClassifyIdByChartInfoIdList(chartInfoIdList, req.NewClassifyId)
 		if err != nil {
-			br.Msg = `指标移动失败！`
-			br.ErrMsg = `指标移动失败，ERR：` + err.Error()
+			br.Msg = `图表移动失败！`
+			br.ErrMsg = `图表移动失败，ERR：` + err.Error()
 			return
 		}
 	}

controllers/data_manage/data_approve/data_approve.go

@@ -312,6 +312,7 @@ func (this *DataApproveController) Cancel() {
 // @Description 审批消息列表
 // @Param   PageSize			query	int		true	"每页数据条数"
 // @Param   CurrentIndex		query	int		true	"当前页页码"
+// @Param   DataType			query   int     true	"审批类型；1：指标审批；2：图表审批"
 // @Success 200 {object} report_approve.DataApproveMessageListResp
 // @router /message/list [get]
 func (this *DataApproveController) MessageList() {
@@ -332,6 +333,8 @@ func (this *DataApproveController) MessageList() {
 	}
 	currentIndex, _ := this.GetInt("currentIndex")
 	pageSize, _ := this.GetInt("pageSize")
+	dataType, _ := this.GetInt("DataType", utils.DataApproveTypeEdb)
+
 	// 分页
 	var startSize int
 	if pageSize <= 0 {
@@ -344,7 +347,7 @@ func (this *DataApproveController) MessageList() {
 
 	resp := new(response.DataApproveMessageListResp)
 	resp.List = make([]*response.DataApproveMessageItem, 0)
-	list, total, unRead, msg, err := dataApproveServ.GetDataApproveMessage(sysUser.AdminId, startSize, pageSize)
+	list, total, unRead, msg, err := dataApproveServ.GetDataApproveMessage(sysUser.AdminId, dataType, startSize, pageSize)
 	if err != nil {
 		if msg != "" {
 			br.Msg = msg

controllers/data_manage/edb_info.go

@@ -1785,10 +1785,17 @@ func (this *EdbInfoController) EdbInfoFilterByEs() {
 	edbTypeList := make([]int, 0)
 	edbInfoType := -1                            // 指标范围
 	edbTypeStr := this.GetString("EdbType", "0") // 指标类型：0-基础和计算；1-基础指标；2-计算指标；3-预测指标
+
+	// 搜索用户id
+	searchUserId := this.SysUser.AdminId
 	{
 		if edbTypeStr == `` || edbTypeStr == `0` {
 			edbTypeList = []int{1, 2}
 			edbInfoType = 0
+		} else if edbTypeStr == `1` { // 数据加工（基础指标），不应该固定创建人的
+			edbTypeList = []int{1}
+			edbInfoType = 0
+			searchUserId = 0
 		} else {
 			var hasEdb, hasPredictEdb bool
 			tmpEdbTypeList := strings.Split(edbTypeStr, `,`)
@@ -1860,7 +1867,7 @@ func (this *EdbInfoController) EdbInfoFilterByEs() {
 	}
 
 	// 普通的搜索
-	total, edbInfoList, err = elastic.SearchEdbInfoData(keyWord, startSize, pageSize, filterSource, source, frequency, noPermissionEdbInfoIdList, noPermissionEdbClassifyIdList, collectEdbInfoIdList, edbTypeList, edbInfoType, edbAuth, this.SysUser.AdminId, sortMap)
+	total, edbInfoList, err = elastic.SearchEdbInfoData(keyWord, startSize, pageSize, filterSource, source, frequency, noPermissionEdbInfoIdList, noPermissionEdbClassifyIdList, collectEdbInfoIdList, edbTypeList, edbInfoType, edbAuth, searchUserId, sortMap)
 
 	if err != nil {
 		edbInfoList = make([]*data_manage.EdbInfoList, 0)

models/data_manage/data_approve/data_approve_message.go

@@ -12,6 +12,7 @@ type DataApproveMessage struct {
 	Id            int       `gorm:"primaryKey;column:id"`
 	SendUserId    int       `gorm:"column:send_user_id"`    // 发送人Id
 	ReceiveUserId int       `gorm:"column:receive_user_id"` // 接收者Id
+	DataType      int       `gorm:"column:data_type"`       // 资产类型
 	Content       string    `gorm:"column:content"`         // 消息内容
 	Remark        string    `gorm:"column:remark"`          // 备注信息
 	DataApproveId int       `gorm:"column:data_approve_id"` // 审批Id
@@ -25,6 +26,7 @@ var DataApproveMessageCols = struct {
 	Id            string
 	SendUserId    string
 	ReceiveUserId string
+	DataType      string
 	Content       string
 	Remark        string
 	DataApproveId string
@@ -36,6 +38,7 @@ var DataApproveMessageCols = struct {
 	Id:            "id",
 	SendUserId:    "send_user_id",
 	ReceiveUserId: "receive_user_id",
+	DataType:      "data_type",
 	Content:       "content",
 	Remark:        "remark",
 	DataApproveId: "data_approve_id",

models/data_manage/data_approve/response/approve_message.go

@@ -14,6 +14,7 @@ type DataApproveMessageItem struct {
 	Id            int
 	SendUserId    int    `description:"发送人ID"`
 	ReceiveUserId int    `description:"接收者ID"`
+	DataType      int    `description:"资产类型"`
 	Content       string `description:"消息内容"`
 	Remark        string `description:"备注信息"`
 	DataApproveId int    `description:"审批ID"`

models/data_manage/response/chart.go

@@ -14,5 +14,5 @@ type ChartRefreshResp struct {
 // ChartInfoChartListResp ETA图库列表返回数据
 type ChartInfoChartListResp struct {
 	Paging *paging.PagingItem
-	List   []*data_manage.ChartInfoList
+	List   []*data_manage.ChartInfoView
 }

services/data/data_approve/approve.go

@@ -145,6 +145,7 @@ func PassDataApprove(approveId int, adminId int) (msg string, err error) {
 				messageItem := new(dataApproveModel.DataApproveMessage)
 				messageItem.SendUserId = approveItem.ApplyUserId
 				messageItem.ReceiveUserId = nextUser.UserId
+				messageItem.DataType = approveItem.DataType
 				messageItem.Content = "您有新的待办任务"
 				messageItem.Remark = fmt.Sprintf("%s提交的【%s】需要您审批，请及时处理", approveItem.ApplyUserName, approveItem.Title)
 				messageItem.DataApproveId = approveItem.DataApproveId
@@ -168,7 +169,7 @@ func PassDataApprove(approveId int, adminId int) (msg string, err error) {
 				err = fmt.Errorf("更新审批当前节点失败, Err: %s", e.Error())
 				return
 			}
-			err = BuildNextNodeRecordAndMsg(nextNode, approveItem.DataApproveId, approveItem.ApplyUserId, approveItem.ApplyUserName, approveItem.Title)
+			err = BuildNextNodeRecordAndMsg(nextNode, approveItem.DataType, approveItem.DataApproveId, approveItem.ApplyUserId, approveItem.ApplyUserName, approveItem.Title)
 			return
 		} else {
 			// 最后一个节点
@@ -214,7 +215,7 @@ func PassDataApprove(approveId int, adminId int) (msg string, err error) {
 				err = fmt.Errorf("更新审批当前节点失败, Err: %s", e.Error())
 				return
 			}
-			err = BuildNextNodeRecordAndMsg(nextNode, approveItem.DataApproveId, approveItem.ApplyUserId, approveItem.ApplyUserName, approveItem.Title)
+			err = BuildNextNodeRecordAndMsg(nextNode, approveItem.DataType, approveItem.DataApproveId, approveItem.ApplyUserId, approveItem.ApplyUserName, approveItem.Title)
 			return
 		}
 	}
@@ -250,7 +251,7 @@ func PassDataApprove(approveId int, adminId int) (msg string, err error) {
 				err = fmt.Errorf("更新审批当前节点失败, Err: %s", e.Error())
 				return
 			}
-			err = BuildNextNodeRecordAndMsg(nextNode, approveItem.DataApproveId, approveItem.ApplyUserId, approveItem.ApplyUserName, approveItem.Title)
+			err = BuildNextNodeRecordAndMsg(nextNode, approveItem.DataType, approveItem.DataApproveId, approveItem.ApplyUserId, approveItem.ApplyUserName, approveItem.Title)
 			return
 		}
 	}
@@ -278,6 +279,7 @@ func PassDataApprove(approveId int, adminId int) (msg string, err error) {
 			messageItem := new(dataApproveModel.DataApproveMessage)
 			messageItem.SendUserId = adminId
 			messageItem.ReceiveUserId = approveItem.ApplyUserId
+			messageItem.DataType = approveItem.DataType
 			messageItem.Content = "您提交的审批已通过"
 			messageItem.Remark = fmt.Sprintf("您提交的【%s】已通过", approveItem.Title)
 			messageItem.DataApproveId = approveItem.DataApproveId
@@ -295,7 +297,7 @@ func PassDataApprove(approveId int, adminId int) (msg string, err error) {
 }
 
 // BuildNextNodeRecordAndMsg 生成下一个节点的审批记录并推送消息
-func BuildNextNodeRecordAndMsg(approveNodeItem *dataApproveModel.DataApproveNode, approveId, sysAdminId int, sysAdminName, title string) (err error) {
+func BuildNextNodeRecordAndMsg(approveNodeItem *dataApproveModel.DataApproveNode, dataType, approveId, sysAdminId int, sysAdminName, title string) (err error) {
 	if approveNodeItem == nil {
 		err = fmt.Errorf("approve node nil")
 		return
@@ -350,6 +352,7 @@ func BuildNextNodeRecordAndMsg(approveNodeItem *dataApproveModel.DataApproveNode
 		for _, v := range newRecords {
 			m := new(dataApproveModel.DataApproveMessage)
 			m.SendUserId = sysAdminId
+			m.DataType = dataType
 			m.ReceiveUserId = v.ApproveUserId
 			m.Content = "您有新的待办任务"
 			m.Remark = fmt.Sprintf("%s提交的【%s】需要您审批，请及时处理", sysAdminName, title)
@@ -912,6 +915,7 @@ func refuseDataApprove(approveItem *dataApproveModel.DataApprove, recordItem *da
 		messageItem := new(dataApproveModel.DataApproveMessage)
 		messageItem.SendUserId = sysAdminId
 		messageItem.ReceiveUserId = approveItem.ApplyUserId
+		messageItem.DataType = approveItem.DataType
 		messageItem.Content = "您提交的审批被驳回"
 		messageItem.Remark = fmt.Sprintf("您提交的【%s】已被驳回", approveItem.Title)
 		messageItem.DataApproveId = approveItem.DataApproveId
@@ -945,7 +949,7 @@ func DataApproveCancel(DataApproveId, adminId int, adminName string) (msg string
 	}
 
 	// 撤销审批
-	e = cancelDataApprove(approveItem, approveItem.DataApproveId, adminId, adminName)
+	e = cancelDataApprove(approveItem, approveItem.DataType, approveItem.DataApproveId, adminId, adminName)
 	if e != nil {
 		msg = "操作失败"
 		err = fmt.Errorf("cancelDataApprove err: %s", e.Error())
@@ -955,7 +959,7 @@ func DataApproveCancel(DataApproveId, adminId int, adminName string) (msg string
 }
 
 // cancelDataApprove 撤回审批
-func cancelDataApprove(item *dataApproveModel.DataApprove, approveId, sysAdminId int, sysAdminName string) (err error) {
+func cancelDataApprove(item *dataApproveModel.DataApprove, dataType, approveId, sysAdminId int, sysAdminName string) (err error) {
 	// todo
 	//// 默认内部审批, 如果是走的第三方审批, 那么仅修改状态
 	//confMap, e := models.GetBusinessConf()
@@ -1016,6 +1020,7 @@ func cancelDataApprove(item *dataApproveModel.DataApprove, approveId, sysAdminId
 			m := new(dataApproveModel.DataApproveMessage)
 			m.SendUserId = sysAdminId
 			m.ReceiveUserId = v.ApproveUserId
+			m.DataType = dataType
 			m.Content = fmt.Sprintf("%s提交的【%s】已撤回", sysAdminName, approveItem.Title)
 			m.DataApproveId = approveId
 			m.ApproveState = DataApproveStateCancel
@@ -1163,7 +1168,7 @@ func SubmitDataApprove(dataType int, dataList []SetDataPublicItem, title, descri
 	approveId = newApprove.DataApproveId
 
 	// 生成节点审批记录
-	err = BuildNextNodeRecordAndMsg(firstNodeItem, newApprove.DataApproveId, sysAdminId, sysAdminName, newApprove.Title)
+	err = BuildNextNodeRecordAndMsg(firstNodeItem, newApprove.DataType, newApprove.DataApproveId, sysAdminId, sysAdminName, newApprove.Title)
 
 	return
 }

services/data/data_approve/approve_message.go

@@ -8,10 +8,10 @@ import (
 	"time"
 )
 
-func GetDataApproveMessage(adminId, startSize, pageSize int) (list []*response.DataApproveMessageItem, total, unread int, msg string, err error) {
-	cond := fmt.Sprintf(` AND %s = ?`, DataApprove.DataApproveMessageCols.ReceiveUserId)
+func GetDataApproveMessage(adminId, dataType, startSize, pageSize int) (list []*response.DataApproveMessageItem, total, unread int, msg string, err error) {
+	cond := fmt.Sprintf(` AND %s = ? AND %s = ? `, DataApprove.DataApproveMessageCols.ReceiveUserId, DataApprove.DataApproveMessageCols.DataType)
 	pars := make([]interface{}, 0)
-	pars = append(pars, adminId)
+	pars = append(pars, adminId, dataType)
 	order := fmt.Sprintf(`%s ASC, %s DESC`, DataApprove.DataApproveMessageCols.IsRead, DataApprove.DataApproveMessageCols.CreateTime)
 
 	messageOb := new(DataApprove.DataApproveMessage)
@@ -78,6 +78,7 @@ func FormatDataApproveMessage2Item(origin *DataApprove.DataApproveMessage) (item
 	item.Id = origin.Id
 	item.SendUserId = origin.SendUserId
 	item.ReceiveUserId = origin.ReceiveUserId
+	item.DataType = origin.DataType
 	item.Content = origin.Content
 	item.Remark = origin.Remark
 	item.DataApproveId = origin.DataApproveId