From c1b9f287c7c8d764a0fd2e2089d31418a562daab Mon Sep 17 00:00:00 2001 From: Chopper Date: Tue, 29 Jun 2021 16:26:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=AE=A1=E7=90=86=E5=91=98?= =?UTF-8?q?=E5=8D=B3=E8=B5=8B=E4=BA=88=E6=9D=83=E9=99=90=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E7=94=9F=E6=95=88=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86=E3=80=82?= =?UTF-8?q?=E7=9B=B4=E6=92=AD=E9=97=B4=E6=9C=AA=E7=99=BB=E5=BD=95=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/broadcast/serviceimpl/StudioServiceImpl.java | 2 +- .../permission/serviceimpl/AdminUserServiceImpl.java | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/framework/src/main/java/cn/lili/modules/broadcast/serviceimpl/StudioServiceImpl.java b/framework/src/main/java/cn/lili/modules/broadcast/serviceimpl/StudioServiceImpl.java index ce2823ce..bc677669 100644 --- a/framework/src/main/java/cn/lili/modules/broadcast/serviceimpl/StudioServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/broadcast/serviceimpl/StudioServiceImpl.java @@ -200,7 +200,7 @@ public class StudioServiceImpl extends ServiceImpl impleme .eq(recommend != null, "recommend", true) .eq(status != null, "status", status) .orderByDesc("create_time"); - if (UserContext.getCurrentUser()!=null&&UserContext.getCurrentUser().getRole().equals(UserEnums.STORE)) { + if (UserContext.getCurrentUser() != null && UserContext.getCurrentUser().getRole().equals(UserEnums.STORE)) { queryWrapper.eq("store_id", UserContext.getCurrentUser().getStoreId()); } return this.page(PageUtil.initPage(pageVO), queryWrapper); diff --git a/framework/src/main/java/cn/lili/modules/permission/serviceimpl/AdminUserServiceImpl.java b/framework/src/main/java/cn/lili/modules/permission/serviceimpl/AdminUserServiceImpl.java index d28b664e..831aec4b 100644 --- a/framework/src/main/java/cn/lili/modules/permission/serviceimpl/AdminUserServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/permission/serviceimpl/AdminUserServiceImpl.java @@ -199,13 +199,12 @@ public class AdminUserServiceImpl extends ServiceImpl 10) { throw new ServiceException(ResultCode.PERMISSION_BEYOND_TEN); } - if (roles != null && roles.size() > 0) { + if (roles.size() > 0) { dbUser.setRoleIds(StringUtils.join(",", roles)); } - - this.save(dbUser); - updateRole(adminUser.getId(), roles); + dbUser = this.findByUsername(dbUser.getUsername()); + updateRole(dbUser.getId(), roles); }