caipin 2 lat temu
rodzic
commit
4f7a3eb8bb

+ 1 - 1
services/bidsection_service.go

@@ -2,7 +2,7 @@
  * @description: 标段相关数据操作相关
  * @Author: CP
  * @Date: 2020-09-28 10:31:31
- * @FilePath: \construction_management\services\bidsection_service.go
+ * @FilePath: \apig:\project\construction_management\services\bidsection_service.go
  */
 package services
 

+ 6 - 3
services/manager_service.go

@@ -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
 }
 
 // 获得管理员详情

+ 5 - 1
web/backstage/manager_bs.go

@@ -93,7 +93,11 @@ func (c *ManagerBs) GetCurrentuser() {
 		return
 	}
 
-	result := c.ServiceManager.GetCurrentManager(staffName)
+	result, err := c.ServiceManager.GetCurrentManager(staffName)
+	if err != nil {
+		c.Ctx.JSON(iris.Map{"code": -1, "msg": fmt.Sprintf("%s", err)})
+		return
+	}
 	c.Ctx.JSON(iris.Map{
 		"code": 0,
 		"data": result,