Pārlūkot izejas kodu

修改gorm:"-"映射bug

hongze 7 mēneši atpakaļ
vecāks
revīzija
099417afe5

+ 1 - 1
models/chart_permission.go

@@ -263,7 +263,7 @@ type SimpleChartPermission struct {
 	ChartPermissionId   int                      `description:"品种ID"`
 	ChartPermissionName string                   `description:"品种名称"`
 	Sort                int                      `description:"排序"`
-	Children            []*SimpleChartPermission `description:"子分类"`
+	Children            []*SimpleChartPermission `gorm:"-" description:"子分类"`
 }
 
 func FormatChartPermission2Simple(origin *ChartPermission) (item *SimpleChartPermission) {

+ 1 - 1
models/cloud_disk_menu.go

@@ -123,5 +123,5 @@ func DeleteCloudDiskMenuAndResourcesByMenuIds(menuIds []int) (err error) {
 
 type CloudDiskMenuTree struct {
 	*CloudDiskMenu
-	Children []*CloudDiskMenuTree
+	Children []*CloudDiskMenuTree `gorm:"-"`
 }

+ 2 - 2
models/company/company_seller.go

@@ -19,7 +19,7 @@ type DepartmentGroupSellers struct {
 	AdminId string `description:"系统用户id"`
 	//AdminName string `description:"系统用户名称"`
 	RealName     string                   `description:"用户真实名称"`
-	ChildrenList []DepartmentGroupSellers `description:"销售列表"`
+	ChildrenList []DepartmentGroupSellers `gorm:"-" description:"销售列表"`
 	RoleTypeCode string                   `description:"角色编码"`
 	Authority    int                      `description:"管理权限,0:无,1:部门负责人,2:小组负责人,或者ficc销售主管,4:ficc销售组长"`
 }
@@ -28,7 +28,7 @@ type DepartmentGroupAdmins struct {
 	AdminId string `description:"系统用户id"`
 	//AdminName string `description:"系统用户名称"`
 	RealName     string                   `description:"用户真实名称"`
-	ChildrenList []*DepartmentGroupAdmins `description:"角色列表"`
+	ChildrenList []*DepartmentGroupAdmins `gorm:"-" description:"角色列表"`
 	RoleTypeCode string                   `description:"角色编码"`
 	Authority    int                      `description:"管理权限,0:无,1:部门负责人,2:小组负责人,或者ficc销售主管,4:ficc销售组长"`
 }

+ 2 - 2
models/data_manage/base_from_baiinfo_classify.go

@@ -110,14 +110,14 @@ type BaseFromBaiinfoClassifyItems struct {
 	//UniqueCode         string                         `description:"唯一编码"`
 	//ModifyTime         time.Time                      `description:"修改时间"`
 	//CreateTime         time.Time                      `description:"创建时间"`
-	Children []*BaseFromBaiinfoClassifyItems `description:"下级"`
+	Children []*BaseFromBaiinfoClassifyItems `gorm:"-" description:"下级"`
 }
 
 type BaseFromBaiinfoClassifyNameItems struct {
 	ClassifyId   int                                 `description:"分类ID"`
 	ClassifyName string                              `description:"分类名称"`
 	ParentId     int                                 `description:"父级id"`
-	Children     []*BaseFromBaiinfoClassifyNameItems `description:"下级"`
+	Children     []*BaseFromBaiinfoClassifyNameItems `gorm:"-" description:"下级"`
 }
 
 type BaseFromBaiinfoClassifyResp struct {

+ 1 - 1
models/data_manage/base_from_national_statistics_classify.go

@@ -98,5 +98,5 @@ type BaseFromNationalStatisticsClassifyItem struct {
 	ParentIds    []int                                     `description:"父级分类ID集合-用于前端的定位"`
 	Dbcode       string                                    `description:"数据库编码"`
 	IsParent     int                                       `description:"是否存在子分类: 0-否; 1-是"`
-	Children     []*BaseFromNationalStatisticsClassifyItem `description:"子分类"`
+	Children     []*BaseFromNationalStatisticsClassifyItem `gorm:"-" description:"子分类"`
 }

+ 1 - 1
models/data_manage/base_from_national_statistics_index.go

@@ -118,7 +118,7 @@ type BaseFromNationalStatisticsIndexItem struct {
 	EndDate          string `description:"结束日期"`
 	CreateTime       string `description:"创建时间"`
 	ModifyTime       string `description:"更新时间"`
-	ChildrenIndexIds []int  `description:"有地区维度的指标-子指标ID集合-用于前端定位"`
+	ChildrenIndexIds []int  `gorm:"-" description:"有地区维度的指标-子指标ID集合-用于前端定位"`
 }
 
 type BaseFromNationalStatisticsIndexListResp struct {

+ 2 - 2
models/data_manage/base_from_sci_classify.go

@@ -106,14 +106,14 @@ type BaseFromSciClassifyItems struct {
 	//UniqueCode         string                         `description:"唯一编码"`
 	//ModifyTime         time.Time                      `description:"修改时间"`
 	//CreateTime         time.Time                      `description:"创建时间"`
-	Children []*BaseFromSciClassifyItems `description:"下级"`
+	Children []*BaseFromSciClassifyItems `gorm:"-" description:"下级"`
 }
 
 type BaseFromSciClassifyNameItems struct {
 	ClassifyId   int                             `description:"分类ID"`
 	ClassifyName string                          `description:"分类名称"`
 	ParentId     int                             `description:"父级id"`
-	Children     []*BaseFromSciClassifyNameItems `description:"下级"`
+	Children     []*BaseFromSciClassifyNameItems `gorm:"-" description:"下级"`
 }
 
 type BaseFromSciClassifyResp struct {

+ 1 - 1
models/data_manage/base_from_sci_hq_classify.go

@@ -28,7 +28,7 @@ type BaseFromSciHqClassifyItem struct {
 	ModifyTime     time.Time                    `description:"修改时间"`
 	CreateTime     time.Time                    `description:"创建时间"`
 	ClassifyNameEn string                       `description:"英文分类名称"`
-	Children       []*BaseFromSciHqClassifyItem `description:"子分类"`
+	Children       []*BaseFromSciHqClassifyItem `gorm:"-" description:"子分类"`
 }
 
 type BaseFromSciHqClassifyMaxSort struct {

+ 2 - 2
models/data_manage/base_from_smm_classify.go

@@ -111,14 +111,14 @@ type BaseFromSmmClassifyItems struct {
 	//UniqueCode         string                         `description:"唯一编码"`
 	//ModifyTime         time.Time                      `description:"修改时间"`
 	//CreateTime         time.Time                      `description:"创建时间"`
-	Children []*BaseFromSmmClassifyItems `description:"下级"`
+	Children []*BaseFromSmmClassifyItems `gorm:"-" description:"下级"`
 }
 
 type BaseFromSmmClassifyNameItems struct {
 	ClassifyId   int                             `description:"分类ID"`
 	ClassifyName string                          `description:"分类名称"`
 	ParentId     int                             `description:"父级id"`
-	Children     []*BaseFromSmmClassifyNameItems `description:"下级"`
+	Children     []*BaseFromSmmClassifyNameItems `gorm:"-" description:"下级"`
 }
 
 type BaseFromSmmClassifyResp struct {

+ 2 - 2
models/data_manage/base_from_ths_hf_classify.go

@@ -181,7 +181,7 @@ type BaseFromThsHfClassifyItem struct {
 	Sort           int                          `description:"排序"`
 	LevelPath      string                       `description:"层级路径"`
 	UniqueCode     string                       `description:"唯一编码"`
-	Children       []*BaseFromThsHfClassifyItem `description:"子分类"`
+	Children       []*BaseFromThsHfClassifyItem `gorm:"-" description:"子分类"`
 }
 
 func (m *BaseFromThsHfClassify) Format2Item() (item *BaseFromThsHfClassifyItem) {
@@ -233,7 +233,7 @@ type BaseFromThsHfClassifyListItem struct {
 	Level          int                              `description:"层级"`
 	Sort           int                              `description:"排序"`
 	UniqueCode     string                           `description:"唯一编码, 指标的话用indexCode"`
-	Children       []*BaseFromThsHfClassifyListItem `description:"子分类"`
+	Children       []*BaseFromThsHfClassifyListItem `gorm:"-" description:"子分类"`
 }
 
 type BaseFromThsHfClassifyMoveReq struct {

+ 1 - 1
models/data_manage/base_from_trade_index.go

@@ -599,7 +599,7 @@ type BaseFromTradeEicIndexV2 struct {
 	Parent                 string
 	CreateTime             time.Time
 	ModifyTime             time.Time
-	Children               []BaseFromTradeEicIndexV2
+	Children               []BaseFromTradeEicIndexV2 `gorm:"-"`
 }
 
 func GetEicDateV2() (date []*BaseFromTradeEicIndexV2, err error) {

+ 8 - 8
models/data_manage/base_from_yongyi_classify.go

@@ -19,14 +19,14 @@ type BaseFromYongyiClassify struct {
 }
 
 type BaseFromYongyiClassifyItems struct {
-	ClassifyId      int    `description:"分类ID"`
-	YongyiIndexId   int    `description:"指标类型ID"`
-	YongyiIndexCode string `description:"指标唯一编码"`
-	ClassifyName    string `description:"分类名称"`
-	ParentId        int    `description:"父级id"`
-	Level           int    `description:"层级"`
-	Sort            int    `description:"排序字段,越小越靠前,默认值:10"`
-	Children        []*BaseFromYongyiClassifyItems
+	ClassifyId      int                            `description:"分类ID"`
+	YongyiIndexId   int                            `description:"指标类型ID"`
+	YongyiIndexCode string                         `description:"指标唯一编码"`
+	ClassifyName    string                         `description:"分类名称"`
+	ParentId        int                            `description:"父级id"`
+	Level           int                            `description:"层级"`
+	Sort            int                            `description:"排序字段,越小越靠前,默认值:10"`
+	Children        []*BaseFromYongyiClassifyItems `gorm:"-"`
 }
 
 type BaseFromYongyiClassifyNameItems struct {

+ 15 - 15
models/data_manage/chart_classify.go

@@ -164,21 +164,21 @@ type ChartClassifyItems struct {
 	ChartClassifyName   string
 	ChartClassifyNameEn string
 	ParentId            int
-	Level               int    `description:"层级"`
-	Sort                int    `description:"排序字段,越小越靠前,默认值:10"`
-	UniqueCode          string `description:"唯一编码"`
-	Source              int    `description:"来源id"`
-	SourceName          string `description:"来源名称"`
-	SysUserId           int    `description:"创建人id"`
-	SysUserRealName     string `description:"创建人姓名"`
-	DateType            int    `description:"日期类型:1:00年至今,2:10年至今,3:15年至今,4:年初至今,5:自定义时间"`
-	StartDate           string `description:"自定义开始日期"`
-	EndDate             string `description:"自定义结束日期"`
-	ChartType           int    `description:"生成样式:1:曲线图,2:季节性图"`
-	Calendar            string `description:"公历/农历"`
-	SeasonStartDate     string `description:"季节性图开始日期"`
-	SeasonEndDate       string `description:"季节性图开始日期"`
-	Children            []*ChartClassifyItems
+	Level               int                      `description:"层级"`
+	Sort                int                      `description:"排序字段,越小越靠前,默认值:10"`
+	UniqueCode          string                   `description:"唯一编码"`
+	Source              int                      `description:"来源id"`
+	SourceName          string                   `description:"来源名称"`
+	SysUserId           int                      `description:"创建人id"`
+	SysUserRealName     string                   `description:"创建人姓名"`
+	DateType            int                      `description:"日期类型:1:00年至今,2:10年至今,3:15年至今,4:年初至今,5:自定义时间"`
+	StartDate           string                   `description:"自定义开始日期"`
+	EndDate             string                   `description:"自定义结束日期"`
+	ChartType           int                      `description:"生成样式:1:曲线图,2:季节性图"`
+	Calendar            string                   `description:"公历/农历"`
+	SeasonStartDate     string                   `description:"季节性图开始日期"`
+	SeasonEndDate       string                   `description:"季节性图开始日期"`
+	Children            []*ChartClassifyItems    `gorm:"-"`
 	Button              ChartClassifyItemsButton `description:"按钮权限"`
 	IsJoinPermission    int                      `description:"是否加入权限管控,0:不加入;1:加入;默认:0"`
 	HaveOperaAuth       bool                     `description:"是否有数据权限,默认:false"`

+ 2 - 2
models/data_manage/edb_classify.go

@@ -260,8 +260,8 @@ type EdbClassifyItems struct {
 	SysUserRealName  string `description:"创建人姓名"`
 	StartDate        string
 	EdbCode          string
-	EdbType          int `description:"指标类型:1:基础指标,2:计算指标"`
-	Children         []*EdbClassifyItems
+	EdbType          int                    `description:"指标类型:1:基础指标,2:计算指标"`
+	Children         []*EdbClassifyItems    `gorm:"-"`
 	Button           EdbClassifyItemsButton `description:"操作权限"`
 	IsJoinPermission int                    `description:"是否加入权限管控,0:不加入;1:加入;默认:0"`
 	HaveOperaAuth    bool                   `description:"是否有数据权限"`

+ 1 - 1
models/data_manage/edb_data_gie.go

@@ -57,7 +57,7 @@ type EicIndexV2 struct {
 	Parent                 string
 	CreateTime             time.Time
 	ModifyTime             time.Time
-	Children               []BaseFromTradeEicIndexV2
+	Children               []BaseFromTradeEicIndexV2 `gorm:"-"`
 }
 
 func GetBaseFromEicDataAllByIndexCodeV2(indexCode, suffix string) (list []*BaseFromTradeEicIndexV2, err error) {

+ 1 - 1
models/data_manage/edb_refresh/edb_refresh_source.go

@@ -54,5 +54,5 @@ type BaseClassifyItems struct {
 	ClassifyName string               `description:"分类名称"`
 	ParentId     int                  `description:"父级id"`
 	UniqueCode   string               `description:"唯一编码"`
-	Children     []*BaseClassifyItems `description:"下级"`
+	Children     []*BaseClassifyItems `gorm:"-" description:"下级"`
 }

+ 11 - 11
models/data_manage/excel/excel_classify.go

@@ -154,17 +154,17 @@ type ExcelClassifyItems struct {
 	ExcelInfoId       int `description:"表格id"`
 	ExcelClassifyName string
 	ParentId          int
-	Level             int    `description:"层级"`
-	Sort              int    `description:"排序字段,越小越靠前,默认值:10"`
-	UniqueCode        string `description:"唯一编码"`
-	SysUserId         int    `description:"创建人id"`
-	SysUserRealName   string `description:"创建人姓名"`
-	StartDate         string `description:"自定义开始日期"`
-	Children          []*ExcelClassifyItems
-	IsJoinPermission  int  `description:"是否加入权限管控,0:不加入;1:加入;默认:0"`
-	HaveOperaAuth     bool `description:"是否有数据权限"`
-	HasShare          bool `description:"是否已共享: true-是; false-否"`
-	ShowShareBtn      bool `description:"是否显示共享按钮: true-是; false-否"`
+	Level             int                   `description:"层级"`
+	Sort              int                   `description:"排序字段,越小越靠前,默认值:10"`
+	UniqueCode        string                `description:"唯一编码"`
+	SysUserId         int                   `description:"创建人id"`
+	SysUserRealName   string                `description:"创建人姓名"`
+	StartDate         string                `description:"自定义开始日期"`
+	Children          []*ExcelClassifyItems `gorm:"-"`
+	IsJoinPermission  int                   `description:"是否加入权限管控,0:不加入;1:加入;默认:0"`
+	HaveOperaAuth     bool                  `description:"是否有数据权限"`
+	HasShare          bool                  `description:"是否已共享: true-是; false-否"`
+	ShowShareBtn      bool                  `description:"是否显示共享按钮: true-是; false-否"`
 }
 
 func GetExcelClassifyByCondition(condition string, pars []interface{}) (item *ExcelClassify, err error) {

+ 7 - 7
models/data_manage/future_good/future_good_chart_classify.go

@@ -62,13 +62,13 @@ type FutureGoodChartClassifyItems struct {
 	FutureGoodChartInfoId       int `description:"表格id"`
 	FutureGoodChartClassifyName string
 	ParentId                    int
-	Level                       int    `description:"层级"`
-	Sort                        int    `description:"排序字段,越小越靠前,默认值:10"`
-	UniqueCode                  string `description:"唯一编码"`
-	SysUserId                   int    `description:"创建人id"`
-	SysUserRealName             string `description:"创建人姓名"`
-	StartDate                   string `description:"自定义开始日期"`
-	Children                    []*FutureGoodChartClassifyItems
+	Level                       int                             `description:"层级"`
+	Sort                        int                             `description:"排序字段,越小越靠前,默认值:10"`
+	UniqueCode                  string                          `description:"唯一编码"`
+	SysUserId                   int                             `description:"创建人id"`
+	SysUserRealName             string                          `description:"创建人姓名"`
+	StartDate                   string                          `description:"自定义开始日期"`
+	Children                    []*FutureGoodChartClassifyItems `gorm:"-"`
 }
 
 func GetFutureGoodChartClassifyByCondition(condition string, pars []interface{}) (item *FutureGoodChartClassify, err error) {

+ 3 - 3
models/data_manage/manual.go

@@ -5,9 +5,9 @@ import (
 )
 
 type ManualSysUser struct {
-	ItemId   int    `description:"部门/组/用户 id"`
-	ItemName string `description:"部门/组/用户 名称"`
-	Children []*ManualSysUser
+	ItemId   int              `description:"部门/组/用户 id"`
+	ItemName string           `description:"部门/组/用户 名称"`
+	Children []*ManualSysUser `gorm:"-"`
 }
 
 type ManualClassifyEdbInfoCount struct {

+ 1 - 1
models/report_approve/report_approve_flow.go

@@ -231,7 +231,7 @@ type ReportClassifyTreeItem struct {
 	ClassifyName string                    `description:"分类名称"`
 	ParentId     int                       `description:"父级ID"`
 	HasFlow      bool                      `description:"是否已配置审批流"`
-	Children     []*ReportClassifyTreeItem `description:"子分类"`
+	Children     []*ReportClassifyTreeItem `gorm:"-" description:"子分类"`
 }
 
 // CreateFlowAndNodes 新增审批流和节点

+ 1 - 1
models/semantic_analysis/sa_compare_classify.go

@@ -163,5 +163,5 @@ type SaCompareClassifyItem struct {
 	SysAdminId          int              `description:"创建人ID"`
 	SysAdminName        string           `description:"创建人姓名"`
 	CreateTime          string           `description:"创建时间"`
-	Children            []*SaCompareItem `description:"分类下的比对"`
+	Children            []*SaCompareItem `gorm:"-" description:"分类下的比对"`
 }

+ 1 - 1
models/semantic_analysis/sa_doc_classify.go

@@ -169,7 +169,7 @@ type SaDocClassifyItem struct {
 	SysAdminId      int                          `description:"创建人ID"`
 	SysAdminName    string                       `description:"创建人名称"`
 	CreateTime      string                       `description:"创建时间"`
-	Children        []*SaDocClassifyChildrenItem `description:"分类下的文档"`
+	Children        []*SaDocClassifyChildrenItem `gorm:"-" description:"分类下的文档"`
 }
 
 type SaDocClassifyChildrenItem struct {

+ 2 - 2
models/speech_recognition/speech_recognition_menu.go

@@ -184,7 +184,7 @@ type SpeechRecognitionMenuItem struct {
 	Level      int                          `description:"目录层级"`
 	Sort       int                          `description:"排序"`
 	CreateTime string                       `description:"创建时间"`
-	Children   []*SpeechRecognitionMenuItem `description:"子目录"`
+	Children   []*SpeechRecognitionMenuItem `gorm:"-" description:"子目录"`
 }
 
 // SpeechRecognitionMenuNodeItem 语音识别目录节点
@@ -199,7 +199,7 @@ type SpeechRecognitionMenuNodeItem struct {
 	Level                 int                              `description:"目录层级"`
 	Sort                  int                              `description:"排序"`
 	CreateTime            string                           `description:"创建时间"`
-	Children              []*SpeechRecognitionMenuNodeItem `description:"子节点"`
+	Children              []*SpeechRecognitionMenuNodeItem `gorm:"-" description:"子节点"`
 }
 
 // SpeechRecognitionMenuAddReq 新增语音识别目录

+ 1 - 1
models/speech_recognition/speech_recognition_tag_menu.go

@@ -184,7 +184,7 @@ type SpeechRecognitionTagMenuItem struct {
 	Level      int                             `description:"目录层级"`
 	Sort       int                             `description:"排序"`
 	CreateTime string                          `description:"创建时间"`
-	Children   []*SpeechRecognitionTagMenuItem `description:"子目录"`
+	Children   []*SpeechRecognitionTagMenuItem `gorm:"-" description:"子目录"`
 }
 
 // SpeechRecognitionTagMenuNodeItem 标签目录树节点

+ 1 - 1
models/system/response/sys_role_admin.go

@@ -30,7 +30,7 @@ type DepartmentGroupSellersResp struct {
 type DepartmentGroupSellers struct {
 	AdminId      string                   `description:"系统用户id"`
 	RealName     string                   `description:"用户真实名称"`
-	ChildrenList []DepartmentGroupSellers `description:"销售列表"`
+	ChildrenList []DepartmentGroupSellers `gorm:"-" description:"销售列表"`
 }
 
 // EnglishAuthRoleDetailResp 英文权限角色详情响应体

+ 2 - 2
models/system/sys_department.go

@@ -109,7 +109,7 @@ type SysDepartmentList struct {
 	DepartmentId   int             `orm:"column(department_id);pk" description:"部门Id"`
 	DepartmentName string          `description:"部门名称"`
 	CreateTime     time.Time       `description:"创建时间"`
-	Child          []*SysGroupList `description:"分组"`
+	Child          []*SysGroupList `gorm:"-" description:"分组"`
 	IsDepartment   bool            `description:"true:部门,false:分组"`
 }
 
@@ -184,5 +184,5 @@ type DepartmentUserTree struct {
 	NodeId   int                   `description:"节点ID"`
 	NodeType int                   `description:"节点类型:1-部门;2-分组;3-用户"`
 	NodeName string                `description:"节点名称"`
-	Children []*DepartmentUserTree `description:"子节点"`
+	Children []*DepartmentUserTree `gorm:"-" description:"子节点"`
 }

+ 1 - 1
models/system/sys_menu.go

@@ -172,7 +172,7 @@ type SysMenuItem struct {
 	Hidden     int            `description:"是否隐藏:1-隐藏 0-显示"`
 	MenuType   int            `description:"菜单类型: 0-菜单; 1-按钮; 2-字段(需要特殊处理)"`
 	ButtonCode string         `description:"按钮/菜单唯一标识"`
-	Children   []*SysMenuItem `description:"子菜单"`
+	Children   []*SysMenuItem `gorm:"-" description:"子菜单"`
 }
 
 // BusinessConf 商户配置表