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

models/data_manage/data_manage_permission/chart.go

@@ -156,11 +156,12 @@ func SetPermissionByChartIdList(chartIdList []string, userIdList []int, source i
 				// 如果存在那么就移除，说明不需要处理了
 				delete(chartInfoPermissionMap, key)
 			} else {
-				// 如果不存在，那么就提那家
+				// 如果不存在，那么就添加
 				addList = append(addList, &ChartInfoPermission{
 					//PermissionId: 0,
 					ChartInfoId: int32(chartInfoId),
 					SysUserId:   int32(userId),
+					Source:      int32(source),
 					ModifyTime:  time.Now(),
 					CreateTime:  time.Now(),
 				})

models/data_manage/data_manage_permission/edb.go

@@ -154,13 +154,14 @@ func SetPermissionByEdbIdList(edbIdList []string, userIdList []int, edbInfoType
 				// 如果存在那么就移除，说明不需要处理了
 				delete(edbInfoPermissionMap, key)
 			} else {
-				// 如果不存在，那么就提那家
+				// 如果不存在，那么就添加
 				addList = append(addList, &EdbInfoPermission{
 					//PermissionId: 0,
-					EdbInfoId:  int32(edbInfoId),
-					SysUserId:  int32(userId),
-					ModifyTime: time.Now(),
-					CreateTime: time.Now(),
+					EdbInfoId:   int32(edbInfoId),
+					SysUserId:   int32(userId),
+					EdbInfoType: int32(edbInfoType),
+					ModifyTime:  time.Now(),
+					CreateTime:  time.Now(),
 				})
 			}
 		}

models/data_manage/data_manage_permission/excel.go

@@ -152,11 +152,12 @@ func SetPermissionByExcelIdList(excelIdList []string, userIdList []int, source i
 				// 如果存在那么就移除，说明不需要处理了
 				delete(excelInfoPermissionMap, key)
 			} else {
-				// 如果不存在，那么就提那家
+				// 如果不存在，那么就添加
 				addList = append(addList, &ExcelInfoPermission{
 					//PermissionId: 0,
 					ExcelInfoId: int32(excelInfoId),
 					SysUserId:   int32(userId),
+					Source:      int32(source),
 					ModifyTime:  time.Now(),
 					CreateTime:  time.Now(),
 				})

models/db.go

@@ -582,8 +582,12 @@ func initSpeechRecognition() {
 // @datetime 2024-03-27 14:03:11
 func initDataMangePerMission() {
 	orm.RegisterModel(
-		new(data_manage_permission.EdbInfoPermission),     // 指标权限表
-		new(data_manage_permission.EdbClassifyPermission), // 指标分类权限表
+		new(data_manage_permission.EdbInfoPermission),       // 指标权限表
+		new(data_manage_permission.EdbClassifyPermission),   // 指标分类权限表
+		new(data_manage_permission.ChartInfoPermission),     // 图表权限表
+		new(data_manage_permission.ChartClassifyPermission), // 图表分类权限表
+		new(data_manage_permission.ExcelInfoPermission),     // ETA表格权限表
+		new(data_manage_permission.ExcelClassifyPermission), // ETA表格分类权限表
 	)
 }