From b56a7695281cc81ad39b49594bbf34789c041504 Mon Sep 17 00:00:00 2001 From: smallchill Date: Tue, 2 Jul 2019 16:45:51 +0800 Subject: [PATCH] =?UTF-8?q?:tada:=20=E4=BC=98=E5=8C=96=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/springblade/system/user/controller/UserController.java | 2 +- .../springblade/system/user/service/impl/UserServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java b/blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java index 500412f3..26222133 100644 --- a/blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java +++ b/blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java @@ -104,7 +104,7 @@ public class UserController { @PreAuth(RoleConstant.HAS_ROLE_ADMIN) @CacheEvict(cacheNames = {USER_CACHE}, allEntries = true) public R update(@Valid @RequestBody User user) { - return R.status(userService.updateById(user)); + return R.status(userService.submit(user)); } /** diff --git a/blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java b/blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java index ce9c1207..369e8ddc 100644 --- a/blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java +++ b/blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java @@ -50,7 +50,7 @@ public class UserServiceImpl extends BaseServiceImpl implement user.setPassword(DigestUtil.encrypt(user.getPassword())); } Integer cnt = baseMapper.selectCount(Wrappers.query().lambda().eq(User::getTenantId, Func.toStr(user.getTenantId(), BladeConstant.ADMIN_TENANT_ID)).eq(User::getAccount, user.getAccount())); - if (cnt > 0) { + if (cnt > 0 && Func.isEmpty(user.getId())) { throw new ApiException("当前用户已存在!"); } return saveOrUpdate(user);