From 5069c3074bc20eba830e6bac27203c04d0093135 Mon Sep 17 00:00:00 2001 From: wenjianzhang Date: Mon, 24 May 2021 18:39:21 +0800 Subject: [PATCH] =?UTF-8?q?feat=20=E2=9C=A8=20=E7=94=A8=E6=88=B7=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E6=B7=BB=E5=8A=A0=E5=88=97=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/service/dto/sys_user.go | 41 +++++++------------------------ 1 file changed, 9 insertions(+), 32 deletions(-) diff --git a/app/admin/service/dto/sys_user.go b/app/admin/service/dto/sys_user.go index 962e3ef..18d73cd 100644 --- a/app/admin/service/dto/sys_user.go +++ b/app/admin/service/dto/sys_user.go @@ -1,8 +1,6 @@ package dto import ( - "github.com/gin-gonic/gin" - "github.com/go-admin-team/go-admin-core/sdk/api" "go-admin/app/admin/models" "go-admin/common/dto" @@ -21,26 +19,20 @@ type SysUserSearch struct { DeptId string `form:"deptId" search:"type:exact;column:dept_id;table:sys_user" comment:"部门"` PostId string `form:"postId" search:"type:exact;column:post_id;table:sys_user" comment:"岗位"` Status string `form:"status" search:"type:exact;column:status;table:sys_user" comment:"状态"` + SysUserOrder +} + +type SysUserOrder struct { + UserIdOrder string `search:"type:order;column:user_id;table:sys_user" form:"userId_order"` + UsernameOrder string `search:"type:order;column:username;table:sys_user" form:"username_order"` + StatusOrder string `search:"type:order;column:status;table:sys_user" form:"status_order"` + CreatedAtOrder string `search:"type:order;column:created_at;table:sys_user" form:"createdAt_order"` } func (m *SysUserSearch) GetNeedSearch() interface{} { return *m } -func (m *SysUserSearch) Bind(ctx *gin.Context) error { - log := api.GetRequestLogger(ctx) - err := ctx.ShouldBind(m) - if err != nil { - log.Debugf("ShouldBind error: %s", err.Error()) - } - return err -} - -func (m *SysUserSearch) Generate() dto.Index { - o := *m - return &o -} - type SysUserControl struct { UserId int `json:"userId" comment:"用户ID"` // 用户ID Username string `json:"username" comment:"用户名"` @@ -58,16 +50,6 @@ type SysUserControl struct { common.ControlBy } -func (s *SysUserControl) Bind(ctx *gin.Context) error { - log := api.GetRequestLogger(ctx) - - err := ctx.ShouldBind(s) - if err != nil { - log.Debugf("ShouldBind error: %s", err.Error()) - } - return err -} - func (s *SysUserControl) Generate(model *models.SysUser) { if s.UserId != 0 { model.UserId = s.UserId @@ -95,11 +77,6 @@ type SysUserById struct { common.ControlBy } -func (s *SysUserById) Generate() dto.Control { - cp := *s - return &cp -} - func (s *SysUserById) GetId() interface{} { if len(s.Ids) > 0 { s.Ids = append(s.Ids, s.Id) @@ -116,4 +93,4 @@ func (s *SysUserById) GenerateM() (common.ActiveRecord, error) { type PassWord struct { NewPassword string `json:"newPassword" binding:"required"` OldPassword string `json:"oldPassword" binding:"required"` -} +} \ No newline at end of file