From a06da857f32569afe402f49bac985ee93c1edd10 Mon Sep 17 00:00:00 2001
From: wenjianzhang <zwj777@live.com>
Date: Sat, 14 Nov 2020 22:12:15 +0800
Subject: [PATCH] =?UTF-8?q?fix=F0=9F=90=9B=20=E8=B5=84=E6=BA=90=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=8E=BB=E6=8E=89=E6=8E=92=E5=BA=8F=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                            | 1 +
 app/admin/models/sys_file_dir.go      | 4 ++--
 app/admin/service/dto/sys_file_dir.go | 6 +++---
 app/admin/service/sys_file_dir.go     | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4604070d..f60c92c5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@ config/settings.dev.yml.log
 config/settings.b.dev.yml
 cmd/migrate/migration/version-local/*
 !cmd/migrate/migration/version-local/doc.go
+*/.DS_Store
diff --git a/app/admin/models/sys_file_dir.go b/app/admin/models/sys_file_dir.go
index 457ea06b..1254d436 100644
--- a/app/admin/models/sys_file_dir.go
+++ b/app/admin/models/sys_file_dir.go
@@ -12,7 +12,7 @@ type SysFileDir struct {
 
 	Label string `json:"label" gorm:"type:varchar(255);comment:目录名称"` // 目录名称
 	PId   uint   `json:"pId" gorm:"type:int(11);comment:上级目录"`        // 上级目录
-	Sort  string `json:"sort" gorm:"type:bigint(20);comment:排序"`      // 排序
+	//Sort  string `json:"sort" gorm:"type:bigint(20);comment:排序"`      // 排序
 	Path  string `json:"path" gorm:"type:varchar(255);comment:路径"`    // 路径
 }
 
@@ -22,7 +22,7 @@ type SysFileDirL struct {
 
 	Label    string        `json:"label" gorm:"type:varchar(255);comment:目录名称"` // 目录名称
 	PId      uint          `json:"pId" gorm:"type:int(11);comment:上级目录"`        // 上级目录
-	Sort     string        `json:"sort" gorm:"type:bigint(20);comment:排序"`      // 排序
+	//Sort     string        `json:"sort" gorm:"type:bigint(20);comment:排序"`      // 排序
 	Path     string        `json:"path" gorm:"type:varchar(255);comment:路径"`    // 路径
 	Children []SysFileDirL `json:"children" gorm:"-"`                           // 下级信息
 }
diff --git a/app/admin/service/dto/sys_file_dir.go b/app/admin/service/dto/sys_file_dir.go
index 489bde19..6fbc61d3 100644
--- a/app/admin/service/dto/sys_file_dir.go
+++ b/app/admin/service/dto/sys_file_dir.go
@@ -17,7 +17,7 @@ type SysFileDirSearch struct {
 	ID    uint   `form:"ID" search:"type:exact;column:id;table:sys_file_dir" comment:"标识"`
 	Label string `form:"label" search:"type:exact;column:label;table:sys_file_dir" comment:"目录名称"`
 	PId   string `form:"pId" search:"type:exact;column:p_id;table:sys_file_dir" comment:"上级目录"`
-	Sort  string `form:"sort" search:"type:exact;column:sort;table:sys_file_dir" comment:"排序"`
+	//Sort  string `form:"sort" search:"type:exact;column:sort;table:sys_file_dir" comment:"排序"`
 	Path  string `form:"path" search:"type:exact;column:path;table:sys_file_dir" comment:"路径"`
 }
 
@@ -43,7 +43,7 @@ type SysFileDirControl struct {
 	ID    uint   `uri:"ID" comment:"标识"` // 标识
 	Label string `json:"label" comment:"目录名称"`
 	PId   uint   `json:"pId" comment:"上级目录"`
-	Sort  string `json:"sort" comment:"排序"`
+	//Sort  string `json:"sort" comment:"排序"`
 	Path  string `json:"path" comment:"路径"`
 }
 
@@ -71,7 +71,7 @@ func (s *SysFileDirControl) GenerateM() (common.ActiveRecord, error) {
 		Model: gorm.Model{ID: s.ID},
 		Label: s.Label,
 		PId:   s.PId,
-		Sort:  s.Sort,
+		//Sort:  s.Sort,
 		Path:  s.Path,
 	}, nil
 }
diff --git a/app/admin/service/sys_file_dir.go b/app/admin/service/sys_file_dir.go
index 77852f8c..1aef746f 100644
--- a/app/admin/service/sys_file_dir.go
+++ b/app/admin/service/sys_file_dir.go
@@ -159,7 +159,7 @@ func SysFileDirCall(list *[]models.SysFileDirL, m models.SysFileDirL) models.Sys
 		mi.ID = listGroup[j].ID
 		mi.PId = listGroup[j].PId
 		mi.Label = listGroup[j].Label
-		mi.Sort = listGroup[j].Sort
+		//mi.Sort = listGroup[j].Sort
 		mi.CreatedAt = listGroup[j].CreatedAt
 		mi.UpdatedAt = listGroup[j].UpdatedAt
 		mi.Children = []models.SysFileDirL{}