Roc 11 месяцев назад
Родитель
Сommit
0e2bd45b1e

+ 12 - 4
models/data_manage/data_manage_permission/message.go

@@ -17,10 +17,12 @@ type DataPermissionMessage struct {
 	Content                 string    `json:"content"`         // 消息内容
 	Remark                  string    `json:"remark"`          // 备注信息
 	OpType                  int32     `json:"op_type"`         // 操作类型,1:单个资产转移,2:资产模块转移,3:资产授权,4:资产分类授权
-	OpUniqueCode            string    `json:"op_unique_code"`  // 操作编码
-	IsRead                  int32     `json:"is_read"`         // 是否已读:0-未读;1-已读
-	CreateTime              time.Time `json:"create_time"`     // 创建时间
-	ModifyTime              time.Time `json:"modify_time"`     // 修改时间
+	Source                  int32     `description:"来源id"`
+	SubSource               int32     `description:"子来源id"`
+	OpUniqueCode            string    `json:"op_unique_code"` // 操作编码
+	IsRead                  int32     `json:"is_read"`        // 是否已读:0-未读;1-已读
+	CreateTime              time.Time `json:"create_time"`    // 创建时间
+	ModifyTime              time.Time `json:"modify_time"`    // 修改时间
 }
 
 var DataPermissionMessageCols = struct {
@@ -30,6 +32,8 @@ var DataPermissionMessageCols = struct {
 	Content                 string
 	Remark                  string
 	OpType                  string
+	Source                  string
+	SubSource               string
 	OpUniqueCode            string
 	IsRead                  string
 	CreateTime              string
@@ -41,6 +45,8 @@ var DataPermissionMessageCols = struct {
 	Content:                 "content",
 	Remark:                  "remark",
 	OpType:                  "op_type",
+	Source:                  "source",
+	SubSource:               "sub_source",
 	OpUniqueCode:            "op_unique_code",
 	IsRead:                  "is_read",
 	CreateTime:              "create_time",
@@ -135,6 +141,8 @@ func FormatDataPermissionMessage2Item(origin *DataPermissionMessage) (item *Data
 		Content:                 origin.Content,
 		Remark:                  origin.Remark,
 		OpType:                  origin.OpType,
+		Source:                  origin.Source,
+		SubSource:               origin.SubSource,
 		OpUniqueCode:            origin.OpUniqueCode,
 		IsRead:                  origin.IsRead,
 		CreateTime:              utils.TimeTransferString(utils.FormatDateTime, origin.CreateTime),

+ 2 - 0
models/data_manage/data_manage_permission/req_and_resp.go

@@ -62,6 +62,8 @@ type DataPermissionMessageItem struct {
 	Content                 string // 消息内容
 	Remark                  string // 备注信息
 	OpType                  int32  // 操作类型,1:单个资产转移,2:资产模块转移,3:资产授权,4:资产分类授权
+	Source                  int32  `description:"来源id"`
+	SubSource               int32  `description:"子来源id"`
 	OpUniqueCode            string // 操作编码
 	IsRead                  int32  // 是否已读:0-未读;1-已读
 	CreateTime              string // 创建时间

+ 2 - 0
services/data/data_manage_permission/data_move.go

@@ -704,6 +704,8 @@ func MoveEdbChart(source, subSource, oldUserId, newUserId int, isSelectAll bool,
 		Content:                 content,
 		Remark:                  content,
 		OpType:                  1,
+		Source:                  int32(source),
+		SubSource:               int32(subSource),
 		OpUniqueCode:            uniqueCode,
 		IsRead:                  0,
 		CreateTime:              time.Now(),