Merge remote-tracking branch 'origin/eta/1.7.6' into debug

controllers/data_manage/data_manage_permission/data_move.go

@@ -352,8 +352,8 @@ func (c *DataMangePermissionController) MoveAllEdbChartUser() {
 // MoveEdbChartCount
 // @Title 获取指标/图表创建人汇总数据接口
 // @Description 获取指标/图表创建人汇总数据接口
-// @Param   Source   query   int  false       "来源 ：1：手工数据指标 2：钢联化工数据库 3：ETA指标库 4：ETA预测指标 5：图库 6：ETA表格"
 // @Param   UserId   query   int  false       "创建人id"
+// @Param   CountType   query   int  false       "来源 ：1：设置资产权限；2：设置数据权限"
 // @Success 200 {object} data_manage.ChartListResp
 // @router /edb_chart/count [get]
 func (c *DataMangePermissionController) MoveEdbChartCount() {
@@ -371,6 +371,7 @@ func (c *DataMangePermissionController) MoveEdbChartCount() {
 	}
 
 	userId, _ := c.GetInt("UserId")
+	countType, _ := c.GetInt("CountType", 1)
 
 	// 没有传入条件，那就默认自动返回
 	if userId <= 0 {
@@ -381,7 +382,7 @@ func (c *DataMangePermissionController) MoveEdbChartCount() {
 		return
 	}
 
-	resp, err := data_manage_permission.GetMoveEdbChartCount(userId)
+	resp, err := data_manage_permission.GetMoveEdbChartCount(userId, countType)
 	if err != nil {
 		//br.Success = true
 		br.Msg = "获取失败"

controllers/message.go

@@ -0,0 +1,86 @@
+package controllers
+
+import (
+	"eta/eta_api/models"
+	"eta/eta_api/models/data_manage/data_manage_permission"
+	"eta/eta_api/models/report_approve"
+	"fmt"
+)
+
+// MessageController
+// @Description: 消息控制器
+type MessageController struct {
+	BaseAuthController
+}
+
+// UnReadMessageNum
+// @Title 获取未读取的消息数量
+// @Description 获取未读取的消息数量
+// @Success 200 {object} data_manage_permission.MessageDetailListResp
+// @router /unread/num [get]
+func (c *MessageController) UnReadMessageNum() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		if br.ErrMsg == "" {
+			br.IsSendEmail = false
+		}
+		c.Data["json"] = br
+		c.ServeJSON()
+	}()
+	sysUser := c.SysUser
+	if sysUser == nil {
+		br.Msg = "请登录"
+		br.ErrMsg = "请登录，SysUser Is Empty"
+		br.Ret = 408
+		return
+	}
+
+	var unReadReportNum, unReadDataPermissionNum int
+
+	// 获取报告审批消息
+	{
+		cond := fmt.Sprintf(` AND %s = ?`, report_approve.ReportApproveMessageCols.ReceiveUserId)
+		pars := make([]interface{}, 0)
+		pars = append(pars, sysUser.AdminId)
+
+		messageOb := new(report_approve.ReportApproveMessage)
+
+		// 未读消息数
+		cond += fmt.Sprintf(` AND %s = ?`, report_approve.ReportApproveMessageCols.IsRead)
+		pars = append(pars, 0)
+		unreadTotal, e := messageOb.GetCountByCondition(cond, pars)
+		if e != nil {
+			br.Msg = "获取失败"
+			br.ErrMsg = "获取审批消息列表总数失败, Err: " + e.Error()
+			return
+		}
+		unReadReportNum = unreadTotal
+	}
+
+	// 获取资产消息
+	{
+		cond := fmt.Sprintf(` AND %s = ?`, data_manage_permission.DataPermissionMessageCols.ReceiveUserId)
+		pars := make([]interface{}, 0)
+		pars = append(pars, sysUser.AdminId)
+
+		messageOb := new(data_manage_permission.DataPermissionMessage)
+		// 未读消息数
+		cond += fmt.Sprintf(` AND %s = ?`, data_manage_permission.DataPermissionMessageCols.IsRead)
+		pars = append(pars, 0)
+		unreadTotal, e := messageOb.GetCountByCondition(cond, pars)
+		if e != nil {
+			br.Msg = "获取失败"
+			br.ErrMsg = "获取资产消息列表总数失败, Err: " + e.Error()
+			return
+		}
+		unReadDataPermissionNum = unreadTotal
+	}
+
+	// 汇总数
+	num := unReadReportNum + unReadDataPermissionNum
+
+	br.Data = num
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "获取成功"
+}

models/data_manage/data_manage_permission/chart.go

@@ -495,7 +495,7 @@ type ChartInfoPermissionNoAuthRecord struct {
 // @param content string
 // @param opUserId int
 // @return err error
-func AddChartInfoPermissionNoAuthRecordBySourceAndDataIdList(source, chartSource int, dataList []DataItem, noAuthUserIdList, authUserIdList []int, uniqueCode, content string, opUserId int) (err error) {
+func AddChartInfoPermissionNoAuthRecordBySourceAndDataIdList(source, chartSource int, dataList []DataItem, noAuthUserIdList, authUserIdList []int, uniqueCode, title, content string, opUserId int) (err error) {
 	num := len(dataList)
 	if num <= 0 {
 		return
@@ -576,7 +576,7 @@ func AddChartInfoPermissionNoAuthRecordBySourceAndDataIdList(source, chartSource
 				DataPermissionMessageId: 0,
 				SendUserId:              int32(opUserId),
 				ReceiveUserId:           int32(userId),
-				Content:                 content,
+				Content:                 title,
 				Remark:                  content,
 				OpType:                  3,
 				Source:                  int32(source),
@@ -673,7 +673,7 @@ type ChartInfoClassifyPermissionNoAuthRecord struct {
 // @param content string
 // @param opUserId int
 // @return err error
-func AddChartInfoClassifyNoAuthRecordBySourceAndClassifyIdList(source, chartSource int, classifyInfoList []ClassifyDataItem, noAuthUserIdList []int, uniqueCode, content string, opUserId int) (err error) {
+func AddChartInfoClassifyNoAuthRecordBySourceAndClassifyIdList(source, chartSource int, classifyInfoList []ClassifyDataItem, noAuthUserIdList []int, uniqueCode, title, content string, opUserId int) (err error) {
 	num := len(classifyInfoList)
 	if num <= 0 {
 		return
@@ -756,7 +756,7 @@ func AddChartInfoClassifyNoAuthRecordBySourceAndClassifyIdList(source, chartSour
 				DataPermissionMessageId: 0,
 				SendUserId:              int32(opUserId),
 				ReceiveUserId:           int32(userId),
-				Content:                 content,
+				Content:                 title,
 				Remark:                  content,
 				OpType:                  4,
 				Source:                  int32(source),
@@ -807,7 +807,7 @@ func AddChartInfoClassifyNoAuthRecordBySourceAndClassifyIdList(source, chartSour
 // @param content string
 // @param opUserId int
 // @return err error
-func AddChartInfoClassifyNoAuthRecordBySourceAndUserIdList(source, chartSource int, noAuthClassifyMap map[int]ClassifyDataItem, configUserIdList []int, uniqueCode, content string, opUserId int) (err error) {
+func AddChartInfoClassifyNoAuthRecordBySourceAndUserIdList(source, chartSource int, noAuthClassifyMap map[int]ClassifyDataItem, configUserIdList []int, uniqueCode, title, content string, opUserId int) (err error) {
 	// 当前配置用户
 	configUserNum := len(configUserIdList)
 	if configUserNum <= 0 {

models/data_manage/data_manage_permission/classify_no_auth_record.go

@@ -357,22 +357,22 @@ type ClassifyDataItem struct {
 // @param content string
 // @param opUserId int
 // @return err error
-func AddClassifyNoAuthRecordBySourceAndClassifyIdList(source, subSource int, classifyInfoList []ClassifyDataItem, noAuthUserIdList []int, uniqueCode, content string, opUserId int) (err error) {
+func AddClassifyNoAuthRecordBySourceAndClassifyIdList(source, subSource int, classifyInfoList []ClassifyDataItem, noAuthUserIdList []int, uniqueCode, title, content string, opUserId int) (err error) {
 	switch source {
 	case 3, 4:
 		edbClassifyType := 0
 		if source == 4 {
 			edbClassifyType = 1
 		}
-		err = AddEdbInfoClassifyNoAuthRecordBySourceAndClassifyIdList(source, edbClassifyType, classifyInfoList, noAuthUserIdList, uniqueCode, content, opUserId)
+		err = AddEdbInfoClassifyNoAuthRecordBySourceAndClassifyIdList(source, edbClassifyType, classifyInfoList, noAuthUserIdList, uniqueCode, title, content, opUserId)
 	case 5:
 		//图库
 		chartSource := utils.CHART_SOURCE_DEFAULT
-		err = AddChartInfoClassifyNoAuthRecordBySourceAndClassifyIdList(source, chartSource, classifyInfoList, noAuthUserIdList, uniqueCode, content, opUserId)
+		err = AddChartInfoClassifyNoAuthRecordBySourceAndClassifyIdList(source, chartSource, classifyInfoList, noAuthUserIdList, uniqueCode, title, content, opUserId)
 
 	case 6:
 		// ETA表格
-		err = AddExcelInfoClassifyNoAuthRecordBySourceAndClassifyIdList(source, subSource, classifyInfoList, noAuthUserIdList, uniqueCode, content, opUserId)
+		err = AddExcelInfoClassifyNoAuthRecordBySourceAndClassifyIdList(source, subSource, classifyInfoList, noAuthUserIdList, uniqueCode, title, content, opUserId)
 
 	default:
 		err = errors.New("错误的source")
@@ -394,22 +394,22 @@ func AddClassifyNoAuthRecordBySourceAndClassifyIdList(source, subSource int, cla
 // @param content string
 // @param opUserId int
 // @return err error
-func AddClassifyNoAuthRecordBySourceAndUserIdList(source, subSource int, noAuthClassifyMap map[int]ClassifyDataItem, configUserIdList []int, uniqueCode, content string, opUserId int) (err error) {
+func AddClassifyNoAuthRecordBySourceAndUserIdList(source, subSource int, noAuthClassifyMap map[int]ClassifyDataItem, configUserIdList []int, uniqueCode, title, content string, opUserId int) (err error) {
 	switch source {
 	case 3, 4:
 		edbClassifyType := 0
 		if source == 4 {
 			edbClassifyType = 1
 		}
-		err = AddEdbInfoClassifyNoAuthRecordBySourceAndUserIdList(source, edbClassifyType, noAuthClassifyMap, configUserIdList, uniqueCode, content, opUserId)
+		err = AddEdbInfoClassifyNoAuthRecordBySourceAndUserIdList(source, edbClassifyType, noAuthClassifyMap, configUserIdList, uniqueCode, title, content, opUserId)
 	case 5:
 		//图库
 		chartSource := utils.CHART_SOURCE_DEFAULT
-		err = AddChartInfoClassifyNoAuthRecordBySourceAndUserIdList(source, chartSource, noAuthClassifyMap, configUserIdList, uniqueCode, content, opUserId)
+		err = AddChartInfoClassifyNoAuthRecordBySourceAndUserIdList(source, chartSource, noAuthClassifyMap, configUserIdList, uniqueCode, title, content, opUserId)
 
 	case 6:
 		// ETA表格
-		err = AddExcelInfoClassifyNoAuthRecordBySourceAndUserIdList(source, subSource, noAuthClassifyMap, configUserIdList, uniqueCode, content, opUserId)
+		err = AddExcelInfoClassifyNoAuthRecordBySourceAndUserIdList(source, subSource, noAuthClassifyMap, configUserIdList, uniqueCode, title, content, opUserId)
 
 	default:
 		err = errors.New("错误的source")

models/data_manage/data_manage_permission/edb.go

@@ -494,7 +494,7 @@ type EdbInfoPermissionNoAuthRecord struct {
 // @param content string
 // @param opUserId int
 // @return err error
-func AddEdbInfoPermissionNoAuthRecordBySourceAndDataIdList(source, edbInfoType int, dataList []DataItem, noAuthUserIdList, authUserIdList []int, uniqueCode, content string, opUserId int) (err error) {
+func AddEdbInfoPermissionNoAuthRecordBySourceAndDataIdList(source, edbInfoType int, dataList []DataItem, noAuthUserIdList, authUserIdList []int, uniqueCode, title, content string, opUserId int) (err error) {
 	num := len(dataList)
 	if num <= 0 {
 		return
@@ -576,7 +576,7 @@ func AddEdbInfoPermissionNoAuthRecordBySourceAndDataIdList(source, edbInfoType i
 				DataPermissionMessageId: 0,
 				SendUserId:              int32(opUserId),
 				ReceiveUserId:           int32(userId),
-				Content:                 content,
+				Content:                 title,
 				Remark:                  content,
 				OpType:                  3,
 				Source:                  int32(source),
@@ -685,7 +685,7 @@ type EdbInfoClassifyPermissionNoAuthRecord struct {
 // @param content string
 // @param opUserId int
 // @return err error
-func AddEdbInfoClassifyNoAuthRecordBySourceAndClassifyIdList(source, edbClassifyType int, classifyInfoList []ClassifyDataItem, noAuthUserIdList []int, uniqueCode, content string, opUserId int) (err error) {
+func AddEdbInfoClassifyNoAuthRecordBySourceAndClassifyIdList(source, edbClassifyType int, classifyInfoList []ClassifyDataItem, noAuthUserIdList []int, uniqueCode, title, content string, opUserId int) (err error) {
 	num := len(classifyInfoList)
 	if num <= 0 {
 		return
@@ -768,7 +768,7 @@ func AddEdbInfoClassifyNoAuthRecordBySourceAndClassifyIdList(source, edbClassify
 				DataPermissionMessageId: 0,
 				SendUserId:              int32(opUserId),
 				ReceiveUserId:           int32(userId),
-				Content:                 content,
+				Content:                 title,
 				Remark:                  content,
 				OpType:                  4,
 				Source:                  int32(source),
@@ -819,7 +819,7 @@ func AddEdbInfoClassifyNoAuthRecordBySourceAndClassifyIdList(source, edbClassify
 // @param content string
 // @param opUserId int
 // @return err error
-func AddEdbInfoClassifyNoAuthRecordBySourceAndUserIdList(source, edbClassifyType int, noAuthClassifyMap map[int]ClassifyDataItem, configUserIdList []int, uniqueCode, content string, opUserId int) (err error) {
+func AddEdbInfoClassifyNoAuthRecordBySourceAndUserIdList(source, edbClassifyType int, noAuthClassifyMap map[int]ClassifyDataItem, configUserIdList []int, uniqueCode, title, content string, opUserId int) (err error) {
 	// 当前配置用户
 	configUserNum := len(configUserIdList)
 	if configUserNum <= 0 {
@@ -904,7 +904,7 @@ func AddEdbInfoClassifyNoAuthRecordBySourceAndUserIdList(source, edbClassifyType
 				DataPermissionMessageId: 0,
 				SendUserId:              int32(opUserId),
 				ReceiveUserId:           int32(userId),
-				Content:                 content,
+				Content:                 title,
 				Remark:                  content,
 				OpType:                  4,
 				Source:                  int32(source),

models/data_manage/data_manage_permission/excel.go

@@ -491,7 +491,7 @@ type ExcelInfoPermissionNoAuthRecord struct {
 // @param content string
 // @param opUserId int
 // @return err error
-func AddExcelInfoPermissionNoAuthRecordBySourceAndDataIdList(source, excelSource int, dataList []DataItem, noAuthUserIdList, authUserIdList []int, uniqueCode, content string, opUserId int) (err error) {
+func AddExcelInfoPermissionNoAuthRecordBySourceAndDataIdList(source, excelSource int, dataList []DataItem, noAuthUserIdList, authUserIdList []int, title, uniqueCode, content string, opUserId int) (err error) {
 	num := len(dataList)
 	if num <= 0 {
 		return
@@ -572,7 +572,7 @@ func AddExcelInfoPermissionNoAuthRecordBySourceAndDataIdList(source, excelSource
 				DataPermissionMessageId: 0,
 				SendUserId:              int32(opUserId),
 				ReceiveUserId:           int32(userId),
-				Content:                 content,
+				Content:                 title,
 				Remark:                  content,
 				OpType:                  3,
 				Source:                  int32(source),
@@ -669,7 +669,7 @@ type ExcelInfoClassifyPermissionNoAuthRecord struct {
 // @param content string
 // @param opUserId int
 // @return err error
-func AddExcelInfoClassifyNoAuthRecordBySourceAndClassifyIdList(source, excelSource int, classifyInfoList []ClassifyDataItem, noAuthUserIdList []int, uniqueCode, content string, opUserId int) (err error) {
+func AddExcelInfoClassifyNoAuthRecordBySourceAndClassifyIdList(source, excelSource int, classifyInfoList []ClassifyDataItem, noAuthUserIdList []int, uniqueCode, title, content string, opUserId int) (err error) {
 	num := len(classifyInfoList)
 	if num <= 0 {
 		return
@@ -752,7 +752,7 @@ func AddExcelInfoClassifyNoAuthRecordBySourceAndClassifyIdList(source, excelSour
 				DataPermissionMessageId: 0,
 				SendUserId:              int32(opUserId),
 				ReceiveUserId:           int32(userId),
-				Content:                 content,
+				Content:                 title,
 				Remark:                  content,
 				OpType:                  4,
 				Source:                  int32(source),
@@ -803,7 +803,7 @@ func AddExcelInfoClassifyNoAuthRecordBySourceAndClassifyIdList(source, excelSour
 // @param content string
 // @param opUserId int
 // @return err error
-func AddExcelInfoClassifyNoAuthRecordBySourceAndUserIdList(source, excelSource int, noAuthClassifyMap map[int]ClassifyDataItem, configUserIdList []int, uniqueCode, content string, opUserId int) (err error) {
+func AddExcelInfoClassifyNoAuthRecordBySourceAndUserIdList(source, excelSource int, noAuthClassifyMap map[int]ClassifyDataItem, configUserIdList []int, uniqueCode, title, content string, opUserId int) (err error) {
 	// 当前配置用户
 	configUserNum := len(configUserIdList)
 	if configUserNum <= 0 {
@@ -888,7 +888,7 @@ func AddExcelInfoClassifyNoAuthRecordBySourceAndUserIdList(source, excelSource i
 				DataPermissionMessageId: 0,
 				SendUserId:              int32(opUserId),
 				ReceiveUserId:           int32(userId),
-				Content:                 content,
+				Content:                 title,
 				Remark:                  content,
 				OpType:                  4,
 				Source:                  int32(source),

models/data_manage/data_manage_permission/no_auth_record.go

@@ -39,23 +39,23 @@ type DataItem struct {
 // @param content string
 // @param opUserId int
 // @return err error
-func AddRecordBySourceAndDataIdList(source, subSource int, dataList []DataItem, noAuthUserIdList, authUserIdList []int, uniqueCode, content string, opUserId int) (err error) {
+func AddRecordBySourceAndDataIdList(source, subSource int, dataList []DataItem, noAuthUserIdList, authUserIdList []int, uniqueCode, title, content string, opUserId int) (err error) {
 	switch source {
 	case 3, 4:
 		edbInfoType := 0
 		if source == 4 {
 			edbInfoType = 1
 		}
-		err = AddEdbInfoPermissionNoAuthRecordBySourceAndDataIdList(source, edbInfoType, dataList, noAuthUserIdList, authUserIdList, uniqueCode, content, opUserId)
+		err = AddEdbInfoPermissionNoAuthRecordBySourceAndDataIdList(source, edbInfoType, dataList, noAuthUserIdList, authUserIdList, uniqueCode, title, content, opUserId)
 
 	case 5:
 		//图库
 		chartSource := utils.CHART_SOURCE_DEFAULT
-		err = AddChartInfoPermissionNoAuthRecordBySourceAndDataIdList(source, chartSource, dataList, noAuthUserIdList, authUserIdList, uniqueCode, content, opUserId)
+		err = AddChartInfoPermissionNoAuthRecordBySourceAndDataIdList(source, chartSource, dataList, noAuthUserIdList, authUserIdList, uniqueCode, title, content, opUserId)
 
 	case 6:
 		// ETA表格
-		err = AddExcelInfoPermissionNoAuthRecordBySourceAndDataIdList(source, subSource, dataList, noAuthUserIdList, authUserIdList, uniqueCode, content, opUserId)
+		err = AddExcelInfoPermissionNoAuthRecordBySourceAndDataIdList(source, subSource, dataList, noAuthUserIdList, authUserIdList, uniqueCode, title, content, opUserId)
 
 	default:
 		return errors.New("错误的source")

routers/commentsRouter.go

@@ -6820,6 +6820,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["eta/eta_api/controllers:MessageController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers:MessageController"],
+        beego.ControllerComments{
+            Method: "UnReadMessageNum",
+            Router: `/unread/num`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["eta/eta_api/controllers:OutLinkController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers:OutLinkController"],
         beego.ControllerComments{
             Method: "AllList",

routers/router.go

@@ -375,6 +375,11 @@ func init() {
 				&fe_calendar.FeCalendarMatterController{},
 			),
 		),
+		web.NSNamespace("/message",
+			web.NSInclude(
+				&controllers.MessageController{},
+			),
+		),
 	)
 	web.AddNamespace(ns)
 }

services/data/data_manage_permission/data_move.go

@@ -499,6 +499,7 @@ func MoveEdbChart(source, subSource, oldUserId, newUserId int, isSelectAll bool,
 	// 操作记录
 	dataPermissionMoveRecordList := make([]*data_manage_permission.DataPermissionMoveRecord, 0)
 	uniqueCode := uuid.NewUUID().Hex32()
+	title := `资产转移`
 	content := `资产转入`
 
 	switch source {
@@ -701,7 +702,7 @@ func MoveEdbChart(source, subSource, oldUserId, newUserId int, isSelectAll bool,
 		DataPermissionMessageId: 0,
 		SendUserId:              int32(opUserId),
 		ReceiveUserId:           int32(adminInfo.AdminId),
-		Content:                 content,
+		Content:                 title,
 		Remark:                  content,
 		OpType:                  1,
 		Source:                  int32(source),
@@ -732,7 +733,7 @@ func MoveEdbChart(source, subSource, oldUserId, newUserId int, isSelectAll bool,
 	return
 }
 
-// MoveAllEdbChart
+// MoveAllEdbChartOld
 // @Description: 通过原创建人转移指标/图表创建人
 // @author: Roc
 // @datetime 2024-03-26 15:11:12
@@ -751,6 +752,7 @@ func MoveAllEdbChartOld(sourceList, oldUserIdList []int, userId, opUserId int) (
 	// 操作记录
 	dataPermissionMoveRecordList := make([]*data_manage_permission.DataPermissionMoveRecord, 0)
 	uniqueCode := uuid.NewUUID().Hex32()
+	title := `资产转移`
 	content := `资产转入`
 	sourceStrList := make([]string, 0)
 
@@ -954,7 +956,7 @@ func MoveAllEdbChartOld(sourceList, oldUserIdList []int, userId, opUserId int) (
 		DataPermissionMessageId: 0,
 		SendUserId:              int32(opUserId),
 		ReceiveUserId:           int32(adminInfo.AdminId),
-		Content:                 content,
+		Content:                 title,
 		Remark:                  content,
 		OpType:                  2,
 		OpUniqueCode:            uniqueCode,
@@ -1002,6 +1004,7 @@ func MoveAllEdbChart(sourceList, oldUserIdList []int, userId, opUserId int) (err
 	// 操作记录
 	dataPermissionMoveRecordList := make([]*data_manage_permission.DataPermissionMoveRecord, 0)
 	uniqueCode := uuid.NewUUID().Hex32()
+	title := `资产转移`
 	content := `资产转入`
 	sourceStrList := make([]string, 0)
 
@@ -1203,7 +1206,7 @@ func MoveAllEdbChart(sourceList, oldUserIdList []int, userId, opUserId int) (err
 		DataPermissionMessageId: 0,
 		SendUserId:              int32(opUserId),
 		ReceiveUserId:           int32(adminInfo.AdminId),
-		Content:                 content,
+		Content:                 title,
 		Remark:                  content,
 		OpType:                  2,
 		OpUniqueCode:            uniqueCode,
@@ -1233,8 +1236,9 @@ func MoveAllEdbChart(sourceList, oldUserIdList []int, userId, opUserId int) (err
 }
 
 // GetMoveEdbChartCount 获取待转移的指标/图表列表
-// @param source 来源 ：1：手工数据指标 2：钢联化工数据库 3：ETA指标库 4：ETA预测指标 5：图库 6：ETA表格
-func GetMoveEdbChartCount(userId int) (sourceMap map[int]int, err error) {
+// @param userId 用户
+// @param countType 来源 ：1：设置资产权限；2：设置数据权限
+func GetMoveEdbChartCount(userId, countType int) (sourceMap map[int]int, err error) {
 	sourceMap = make(map[int]int)
 	{
 		// 手工数据指标
@@ -1271,23 +1275,6 @@ func GetMoveEdbChartCount(userId int) (sourceMap map[int]int, err error) {
 		sourceMap[2] = total
 	}
 
-	{
-		// 钢联化工数据库
-		var condition string
-		var pars []interface{}
-		if userId > 0 {
-			condition += ` AND sys_user_id = ? `
-			pars = append(pars, userId)
-		}
-
-		total, tmpErr := data_manage.GetMysteelChemicalIndexCount(condition, pars)
-		if tmpErr != nil {
-			err = tmpErr
-			return
-		}
-		sourceMap[2] = total
-	}
-
 	{
 		// ETA指标库
 		var condition string
@@ -1352,11 +1339,20 @@ func GetMoveEdbChartCount(userId int) (sourceMap map[int]int, err error) {
 		var condition string
 		var pars []interface{}
 
+		condition += ` AND is_delete = 0 `
+
 		if userId > 0 {
 			condition += ` AND sys_user_id = ? `
 			pars = append(pars, userId)
 		}
 
+		switch countType {
+		case 2:
+			condition += ` AND source in (2,3) `
+		default:
+			condition += ` AND source in (2,3,4) `
+		}
+
 		total, tmpErr := excel.GetExcelInfoCountByCondition(condition, pars)
 		if tmpErr != nil {
 			err = tmpErr

services/data/data_manage_permission/edb_permission.go

@@ -56,6 +56,7 @@ func SetEdbChartPermission(source, subSource, userId int, authUserList []int, is
 	}
 
 	uniqueCode := uuid.NewUUID().Hex32()
+	title := `数据权限变更`
 	content := `数据权限`
 	dataList := make([]data_manage_permission.DataItem, 0)
 
@@ -183,7 +184,7 @@ func SetEdbChartPermission(source, subSource, userId int, authUserList []int, is
 	content += "已关闭"
 
 	// 添加未授权记录
-	authRecordErr = data_manage_permission.AddRecordBySourceAndDataIdList(source, subSource, dataList, noAuthUserIdList, authUserList, uniqueCode, content, opUserId)
+	authRecordErr = data_manage_permission.AddRecordBySourceAndDataIdList(source, subSource, dataList, noAuthUserIdList, authUserList, uniqueCode, title, content, opUserId)
 
 	return
 }
@@ -200,6 +201,7 @@ func SetEdbChartPermission(source, subSource, userId int, authUserList []int, is
 // @return errMsg string
 func SetDataClassifyIsPermission(source, subSource int, classifyIdList []int, opUserId int) (err error, errMsg string) {
 	uniqueCode := uuid.NewUUID().Hex32()
+	title := `数据权限变更`
 	content := `分类权限`
 	classifyDataList := make([]data_manage_permission.ClassifyDataItem, 0)
 
@@ -311,7 +313,7 @@ func SetDataClassifyIsPermission(source, subSource int, classifyIdList []int, op
 
 	content += "已关闭"
 	// 添加未授权记录
-	authRecordErr = data_manage_permission.AddClassifyNoAuthRecordBySourceAndClassifyIdList(source, subSource, classifyDataList, noAuthUserIdList, uniqueCode, content, opUserId)
+	authRecordErr = data_manage_permission.AddClassifyNoAuthRecordBySourceAndClassifyIdList(source, subSource, classifyDataList, noAuthUserIdList, uniqueCode, title, content, opUserId)
 
 	return
 }
@@ -329,6 +331,7 @@ func SetDataClassifyIsPermission(source, subSource int, classifyIdList []int, op
 // @return errMsg string
 func SetEdbChartClassifyPermission(source, subSource int, authUserList []int, classifyIdList []int, opUserId int) (err error, errMsg string) {
 	uniqueCode := uuid.NewUUID().Hex32()
+	title := `数据权限变更`
 	content := `分类权限`
 	secretClassifyInfoList := make([]data_manage_permission.ClassifyDataItem, 0)
 
@@ -440,7 +443,7 @@ func SetEdbChartClassifyPermission(source, subSource int, authUserList []int, cl
 	}
 
 	// 添加未授权记录
-	authRecordErr = data_manage_permission.AddClassifyNoAuthRecordBySourceAndUserIdList(source, subSource, noAuthClassifyMap, authUserList, uniqueCode, content, opUserId)
+	authRecordErr = data_manage_permission.AddClassifyNoAuthRecordBySourceAndUserIdList(source, subSource, noAuthClassifyMap, authUserList, uniqueCode, title, content, opUserId)
 
 	return
 }