From c46de3ae049d2db96e9191d7910ad0a5a0c418f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E7=A5=A5=E8=B6=85?= Date: Thu, 3 Dec 2020 19:14:35 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=B3=BB=E7=BB=9F=E7=94=A8=E6=88=B7]=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E7=94=A8=E6=88=B7=E5=8F=AF=E4=BB=A5=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E5=90=AF=E7=94=A8/=E7=A6=81=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/db/models/admin_dao.go | 4 +++- internal/rpc/services/service_admin.go | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/internal/db/models/admin_dao.go b/internal/db/models/admin_dao.go index f1a0d2ae..8f267382 100644 --- a/internal/db/models/admin_dao.go +++ b/internal/db/models/admin_dao.go @@ -88,6 +88,7 @@ func (this *AdminDAO) CheckAdminPassword(username string, encryptedPassword stri Attr("username", username). Attr("password", encryptedPassword). Attr("state", AdminStateEnabled). + Attr("isOn", true). ResultPk(). FindInt64Col(0) } @@ -154,7 +155,7 @@ func (this *AdminDAO) UpdateAdminInfo(adminId int64, fullname string) error { } // 修改管理员详细信息 -func (this *AdminDAO) UpdateAdmin(adminId int64, username string, password string, fullname string, isSuper bool, modulesJSON []byte) error { +func (this *AdminDAO) UpdateAdmin(adminId int64, username string, password string, fullname string, isSuper bool, modulesJSON []byte, isOn bool) error { if adminId <= 0 { return errors.New("invalid adminId") } @@ -171,6 +172,7 @@ func (this *AdminDAO) UpdateAdmin(adminId int64, username string, password strin } else { op.Modules = "[]" } + op.IsOn = isOn _, err := this.Save(op) return err } diff --git a/internal/rpc/services/service_admin.go b/internal/rpc/services/service_admin.go index d5066a17..c07cb31d 100644 --- a/internal/rpc/services/service_admin.go +++ b/internal/rpc/services/service_admin.go @@ -286,7 +286,7 @@ func (this *AdminService) UpdateAdmin(ctx context.Context, req *pb.UpdateAdminRe // TODO 检查权限 - err = models.SharedAdminDAO.UpdateAdmin(req.AdminId, req.Username, req.Password, req.Fullname, req.IsSuper, req.ModulesJSON) + err = models.SharedAdminDAO.UpdateAdmin(req.AdminId, req.Username, req.Password, req.Fullname, req.IsSuper, req.ModulesJSON, req.IsOn) if err != nil { return nil, err }