Merge branch 'dev'

This commit is contained in:
wucongxing8150 2024-04-01 11:10:56 +08:00
commit c622292252

View File

@ -197,7 +197,7 @@ func (r *AdminUserService) PutUser(c *gin.Context, requestUserId int64, putUserR
adminUserDao := dao.AdminUserDao{}
loginAdminUser, err := adminUserDao.GetAdminUserFirstById(loginUserId)
if err != nil || loginAdminUser == nil {
if err != nil && loginAdminUser == nil {
return false, errors.New("用户数据错误")
}
@ -211,7 +211,7 @@ func (r *AdminUserService) PutUser(c *gin.Context, requestUserId int64, putUserR
// 获取需修改用户数据
adminUser, err := adminUserDao.GetAdminUserFirstById(requestUserId)
if err != nil || adminUser == nil {
if err != nil && adminUser == nil {
return false, errors.New("用户数据错误")
}
@ -223,7 +223,7 @@ func (r *AdminUserService) PutUser(c *gin.Context, requestUserId int64, putUserR
adminRoleDao := dao.AdminRoleDao{}
adminRole, err := adminRoleDao.GetAdminRoleFirstById(loginRoleId)
if err != nil || adminRole == nil {
if err != nil && adminRole == nil {
return false, errors.New("非法操作")
}
@ -242,7 +242,7 @@ func (r *AdminUserService) PutUser(c *gin.Context, requestUserId int64, putUserR
if putUserRequest.Phone != adminUser.Phone {
// 检测手机号
res, err := adminUserDao.GetAdminUserFirstByPhone(putUserRequest.Phone)
if res != nil || err != nil {
if res != nil && err != nil {
return false, errors.New("手机号重复")
}
}
@ -258,7 +258,7 @@ func (r *AdminUserService) PutUser(c *gin.Context, requestUserId int64, putUserR
if roleID != adminUser.RoleID {
res, err := adminRoleDao.GetAdminRoleFirstById(roleID)
if err != nil || res == nil {
if err != nil && res == nil {
return false, errors.New("角色错误")
}
}
@ -272,7 +272,7 @@ func (r *AdminUserService) PutUser(c *gin.Context, requestUserId int64, putUserR
if deptID != adminUser.DeptID {
adminDeptDao := dao.AdminDeptDao{}
res, err := adminDeptDao.GetAdminDeptById(deptID)
if err != nil || res == nil {
if err != nil && res == nil {
return false, errors.New("部门错误")
}
}
@ -286,7 +286,7 @@ func (r *AdminUserService) PutUser(c *gin.Context, requestUserId int64, putUserR
if postID != adminUser.PostID {
adminPostDao := dao.AdminPostDao{}
res, err := adminPostDao.GetAdminPostById(postID)
if err != nil || res == nil {
if err != nil && res == nil {
return false, errors.New("岗位错误")
}
}