mirror of
https://github.com/go-admin-team/go-admin.git
synced 2026-09-21 10:13:01 +00:00
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts: # template/v4/dto.go.template
This commit is contained in:
@@ -144,11 +144,11 @@ func SysFileDirCall(list *[]models.SysFileDirL, m models.SysFileDirL) models.Sys
|
||||
listGroup := *list
|
||||
min := make([]models.SysFileDirL, 0)
|
||||
for j := 0; j < len(listGroup); j++ {
|
||||
if m.ID != listGroup[j].PId {
|
||||
if m.Id != listGroup[j].PId {
|
||||
continue
|
||||
}
|
||||
mi := models.SysFileDirL{}
|
||||
mi.ID = listGroup[j].ID
|
||||
mi.Id = listGroup[j].Id
|
||||
mi.PId = listGroup[j].PId
|
||||
mi.Label = listGroup[j].Label
|
||||
//mi.Sort = listGroup[j].Sort
|
||||
@@ -165,4 +165,4 @@ func SysFileDirCall(list *[]models.SysFileDirL, m models.SysFileDirL) models.Sys
|
||||
}
|
||||
|
||||
return m
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user