retusn del nil
This commit is contained in:
@@ -38,17 +38,17 @@ func (l *AdminEditLogic) AdminEdit(in *admin.AdminEditRequest) (*admin.Response,
|
||||
}
|
||||
adminInfo := utils.GetUserFromCtx(l.ctx)
|
||||
if adminInfo.ID < utils.NumberOne {
|
||||
return l.fail(utils.ErrorNoLoginInfo), nil
|
||||
return l.fail(utils.ErrorNoLoginInfo)
|
||||
}
|
||||
encryPhone, cErr := utils.EncryptPhone(in.Phone)
|
||||
if cErr != nil {
|
||||
l.Logger.Error(cErr)
|
||||
return l.fail(utils.ErrorEncryptAesError), nil
|
||||
return l.fail(utils.ErrorEncryptAesError)
|
||||
}
|
||||
|
||||
info, check := l.checkPhone(encryPhone)
|
||||
if !check {
|
||||
return l.fail(utils.ErrorEncryptAesError), nil
|
||||
return l.fail(utils.ErrorEncryptAesError)
|
||||
}
|
||||
modelObj := model.AdminModel{}.Init()
|
||||
if in.Id > utils.NumberZero && info.Id < utils.NumberOne {
|
||||
@@ -57,28 +57,28 @@ func (l *AdminEditLogic) AdminEdit(in *admin.AdminEditRequest) (*admin.Response,
|
||||
err := modelObj.GetOne(w, &info)
|
||||
if err != nil {
|
||||
l.Logger.Error(cErr)
|
||||
return l.fail(utils.Fail), nil
|
||||
return l.fail(utils.Fail)
|
||||
|
||||
}
|
||||
if info.Id < utils.NumberZero {
|
||||
return l.fail(utils.ErrorNotFund), nil
|
||||
return l.fail(utils.ErrorNotFund)
|
||||
}
|
||||
}
|
||||
//编辑
|
||||
if in.Id > utils.NumberZero {
|
||||
if info.Id < utils.NumberOne {
|
||||
return l.fail(utils.ErrorNotFund), nil
|
||||
return l.fail(utils.ErrorNotFund)
|
||||
}
|
||||
if info.Id != in.Id {
|
||||
return l.fail(utils.ErrorExistUser), nil
|
||||
return l.fail(utils.ErrorExistUser)
|
||||
}
|
||||
} else {
|
||||
if len(in.Password) < utils.NumberOne {
|
||||
return l.out(utils.ErrorParams, "密码不能为空"), nil
|
||||
return l.out(utils.ErrorParams, "密码不能为空")
|
||||
|
||||
}
|
||||
if info.Id > utils.NumberZero {
|
||||
return l.fail(utils.ErrorExistUser), nil
|
||||
return l.fail(utils.ErrorExistUser)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -111,9 +111,9 @@ func (l *AdminEditLogic) AdminEdit(in *admin.AdminEditRequest) (*admin.Response,
|
||||
|
||||
if err != nil {
|
||||
l.Logger.Error(err)
|
||||
return l.fail(utils.Fail), nil
|
||||
return l.fail(utils.Fail)
|
||||
}
|
||||
return l.ok(info.Id), nil
|
||||
return l.ok(info.Id)
|
||||
}
|
||||
|
||||
func (l *AdminEditLogic) checkPhone(phone string) (dao.Admin, bool) {
|
||||
|
||||
Reference in New Issue
Block a user