feat:完善信息
This commit is contained in:
@ -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 {
|
||||
|
@ -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 {
|
||||
|
@ -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
|
||||
|
||||
}
|
||||
|
||||
|
@ -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 数据处理
|
||||
|
Reference in New Issue
Block a user