feat:完善信息

This commit is contained in:
henry
2021-10-12 16:53:49 +08:00
parent cf3bc8ffb4
commit eccd71809d
14 changed files with 88 additions and 69 deletions

View File

@ -73,7 +73,7 @@ func (c *Account) Login(account, password, captchaKey, captchaValue, equipment,
}
if level <= 0 {
session.TenantID = mSysTenant.ID
session.TenantKey = mSysTenant.Key
//session.TenantKey = mSysTenant.Key
}
// 判断是否含有含有上级
if mSysTenant.ParentID <= 0 {

View File

@ -47,7 +47,7 @@ func (c *Log) Login(name string, page, pageSize int) (*ReturnPages, error) {
SysUserLoginLogInfo: v, IPAddress: string(ipAddress),
})
}
return &ReturnPages{Data: list, Page: page, TotalCount: count}, nil
return &ReturnPages{Data: list, Count: count}, nil
}
func NewLog() LogHandle {

View File

@ -63,7 +63,7 @@ func (c *Instance) List(name string, status, page, pageSize int) (*controller.Re
for _, v := range out {
list = append(list, &InstanceInfo{SysRole: v, StatusTitle: v.StatusTitle()})
}
return &controller.ReturnPages{Data: list, Page: page, TotalCount: count}, nil
return &controller.ReturnPages{Data: list, Count: count}, nil
}

View File

@ -97,7 +97,7 @@ func member(id uint64) func(args ...interface{}) (interface{}, error) {
if err != nil {
return nil, err
}
return &controller.ReturnPages{Data: out, Page: page, TotalCount: count}, nil
return &controller.ReturnPages{Data: out, Count: count}, nil
}
}
@ -165,7 +165,7 @@ func (c *Instance) List(name string, status, page, pageSize int) (*controller.Re
list = append(list, &InstanceInfo{SysTenantInfo: v})
}
return &controller.ReturnPages{Data: list, Page: page, TotalCount: count}, nil
return &controller.ReturnPages{Data: list, Count: count}, nil
}
// Add 数据处理