|
@@ -25,7 +25,7 @@ type ManagerService interface {
|
|
|
GetAll() (dataList []viewmodels.Manager, total int64)
|
|
|
CountAll() int64
|
|
|
Get(id int) *viewmodels.Manager
|
|
|
- GetCurrentManager(staffName string) *viewmodels.CurrentManager
|
|
|
+ GetCurrentManager(staffName string) (*viewmodels.CurrentManager, error)
|
|
|
Update(data viewmodels.Manager, id int, groupId int) error
|
|
|
Create(data *models.CmManager) error
|
|
|
Enable(id int, canLogin int) error
|
|
@@ -61,11 +61,14 @@ func (s *managerService) CountAll() int64 {
|
|
|
return s.dao.CountAll()
|
|
|
}
|
|
|
|
|
|
-func (s *managerService) GetCurrentManager(staffName string) *viewmodels.CurrentManager {
|
|
|
+func (s *managerService) GetCurrentManager(staffName string) (*viewmodels.CurrentManager, error) {
|
|
|
managerData := s.dao.GetUserName(staffName)
|
|
|
groupDao := dao.NewGroupDao(datasource.InstanceDbMaster())
|
|
|
|
|
|
groupData := groupDao.Get(managerData.GroupId)
|
|
|
+ if groupData.Id == 0 {
|
|
|
+ return nil, errors.New("未找到管理组")
|
|
|
+ }
|
|
|
|
|
|
cmData := viewmodels.CurrentManager{}
|
|
|
id, _ := comm.AesEncrypt(strconv.Itoa(managerData.Id), conf.SignSecret)
|
|
@@ -78,7 +81,7 @@ func (s *managerService) GetCurrentManager(staffName string) *viewmodels.Current
|
|
|
cmData.IsAdmin = managerData.IsAdmin
|
|
|
cmData.Username = managerData.Username
|
|
|
cmData.StaffId = StaffId
|
|
|
- return &cmData
|
|
|
+ return &cmData, nil
|
|
|
}
|
|
|
|
|
|
// 获得管理员详情
|