Merge branch 'dev'
This commit is contained in:
commit
9fb23b45cd
14 files changed
+125
-79
No files matched your search
@@ -1,14 +1,13 @@
|
||||
package dto
|
||||
|
||||
import (
|
||||
models2 "go-admin/app/other/models"
|
||||
"go-admin/app/other/models"
|
||||
"time"
|
||||
|
||||
"github.com/gin-gonic/gin"
|
||||
"github.com/go-admin-team/go-admin-core/sdk/api"
|
||||
|
||||
"go-admin/common/dto"
|
||||
common "go-admin/common/models"
|
||||
)
|
||||
|
||||
type SysChinaAreaDataSearch struct {
|
||||
@@ -32,7 +31,7 @@ func (m *SysChinaAreaDataSearch) Bind(ctx *gin.Context) error {
|
||||
|
||||
type SysChinaAreaDataControl struct {
|
||||
Id int `uri:"id" comment:"编码"` // 编码
|
||||
PId string `json:"pId" comment:"上级编码"`
|
||||
PId int `json:"pId" comment:"上级编码"`
|
||||
Name string `json:"name" comment:"名称"`
|
||||
CreateTime time.Time `json:"createTime" comment:""`
|
||||
UpdateTime time.Time `json:"updateTime" comment:""`
|
||||
@@ -53,11 +52,11 @@ func (s *SysChinaAreaDataControl) Bind(ctx *gin.Context) error {
|
||||
return err
|
||||
}
|
||||
|
||||
func (s *SysChinaAreaDataControl) Generate() (*models2.SysChinaAreaData, error) {
|
||||
return &models2.SysChinaAreaData{
|
||||
Model: common.Model{Id: s.Id},
|
||||
PId: s.PId,
|
||||
Name: s.Name,
|
||||
func (s *SysChinaAreaDataControl) Generate() (*models.SysChinaAreaData, error) {
|
||||
return &models.SysChinaAreaData{
|
||||
Id: s.Id,
|
||||
PId: s.PId,
|
||||
Name: s.Name,
|
||||
}, nil
|
||||
}
|
||||
|
||||
|
||||
@@ -2,15 +2,15 @@ package service
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"go-admin/app/other/models"
|
||||
"go-admin/app/other/service/dto"
|
||||
common "go-admin/common/models"
|
||||
|
||||
"github.com/go-admin-team/go-admin-core/sdk/service"
|
||||
"gorm.io/gorm"
|
||||
|
||||
"go-admin/app/other/models"
|
||||
"go-admin/app/other/service/dto"
|
||||
"go-admin/common/actions"
|
||||
cDto "go-admin/common/dto"
|
||||
common "go-admin/common/models"
|
||||
)
|
||||
|
||||
type SysChinaAreaData struct {
|
||||
@@ -18,22 +18,46 @@ type SysChinaAreaData struct {
|
||||
}
|
||||
|
||||
// GetPage 获取SysChinaAreaData列表
|
||||
func (e *SysChinaAreaData) GetPage(c *dto.SysChinaAreaDataSearch, p *actions.DataPermission, list *[]models.SysChinaAreaData, count *int64) error {
|
||||
func (e *SysChinaAreaData) GetPage(c *dto.SysChinaAreaDataSearch, list *[]models.SysChinaAreaData) *SysChinaAreaData {
|
||||
var data models.SysChinaAreaData
|
||||
|
||||
var areaDataList []models.SysChinaAreaData
|
||||
err := e.Orm.Model(&data).
|
||||
Scopes(
|
||||
cDto.MakeCondition(c.GetNeedSearch()),
|
||||
cDto.Paginate(c.GetPageSize(), c.GetPageIndex()),
|
||||
actions.Permission(data.TableName(), p),
|
||||
).
|
||||
Find(list).Limit(-1).Offset(-1).
|
||||
Count(count).Error
|
||||
Find(&areaDataList).Error
|
||||
if err != nil {
|
||||
e.Log.Errorf("Service GetSysChinaAreaDataPage error:%s", err)
|
||||
return err
|
||||
_ = e.AddError(err)
|
||||
return e
|
||||
}
|
||||
return nil
|
||||
for i := 0; i < len(areaDataList); i++ {
|
||||
if areaDataList[i].PId != 86 {
|
||||
continue
|
||||
}
|
||||
menusInfo := areaDataCall(&areaDataList, areaDataList[i])
|
||||
*list = append(*list, menusInfo)
|
||||
}
|
||||
return e
|
||||
}
|
||||
|
||||
// areaDataCall 构建树
|
||||
func areaDataCall(areaDataList *[]models.SysChinaAreaData, areaData models.SysChinaAreaData) models.SysChinaAreaData {
|
||||
list := *areaDataList
|
||||
|
||||
min := make([]models.SysChinaAreaData, 0)
|
||||
for j := 0; j < len(list); j++ {
|
||||
if areaData.Id != list[j].PId {
|
||||
continue
|
||||
}
|
||||
mi := models.SysChinaAreaData{}
|
||||
mi = list[j]
|
||||
mi.Children = []models.SysChinaAreaData{}
|
||||
ms := areaDataCall(areaDataList, mi)
|
||||
min = append(min, ms)
|
||||
}
|
||||
areaData.Children = min
|
||||
return areaData
|
||||
}
|
||||
|
||||
// Get 获取SysChinaAreaData对象
|
||||
|
||||
Reference in new issue
Block a user