From 3a6d1a6dbb2042c92d5d92d6027578e646e4a1b1 Mon Sep 17 00:00:00 2001 From: smallchill Date: Wed, 3 Apr 2019 17:40:28 +0800 Subject: [PATCH] =?UTF-8?q?:zap:=20=E5=A2=9E=E5=8A=A0=E5=85=B3=E9=97=AD?= =?UTF-8?q?=E5=A4=9A=E7=A7=9F=E6=88=B7=E5=90=8E=EF=BC=8C=E7=94=A8=E6=88=B7?= =?UTF-8?q?code=E4=B8=BA=E7=A9=BA=E7=9A=84=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../springblade/system/user/service/impl/UserServiceImpl.java | 3 ++- doc/mvn/mvn命令.md | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) 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 20a54328..4734f421 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 @@ -22,6 +22,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.exceptions.ApiException; import org.springblade.common.constant.CommonConstant; import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.core.tool.constant.BladeConstant; import org.springblade.core.tool.utils.DigestUtil; import org.springblade.core.tool.utils.Func; import org.springblade.system.user.entity.User; @@ -46,7 +47,7 @@ public class UserServiceImpl extends BaseServiceImpl implement if (Func.isNotEmpty(user.getPassword())) { user.setPassword(DigestUtil.encrypt(user.getPassword())); } - Integer cnt = baseMapper.selectCount(Wrappers.query().lambda().eq(User::getTenantCode, user.getTenantCode()).eq(User::getAccount, user.getAccount())); + Integer cnt = baseMapper.selectCount(Wrappers.query().lambda().eq(User::getTenantCode, Func.toStr(user.getTenantCode(), BladeConstant.ADMIN_TENANT_CODE)).eq(User::getAccount, user.getAccount())); if (cnt > 0) { throw new ApiException("当前用户已存在!"); } diff --git a/doc/mvn/mvn命令.md b/doc/mvn/mvn命令.md index 804e7515..bc5321d9 100644 --- a/doc/mvn/mvn命令.md +++ b/doc/mvn/mvn命令.md @@ -1 +1,3 @@ -mvn install:install-file -Dfile=blade-core-1.0.jar -DgroupId=org.springblade -DartifactId=blade-core -Dversion=1.0 -Dpackaging=jar \ No newline at end of file +mvn install:install-file -Dfile=blade-core-1.0.jar -DgroupId=org.springblade -DartifactId=blade-core -Dversion=1.0 -Dpackaging=jar + +mvn deploy:deploy-file -DgroupId=com.zhuozhengsoft -DartifactId=pageoffice -Dversion=4.5.0.2 -Dpackaging=jar -Dfile=pageoffice4.5.0.2.jar -Durl=http://nexus.bladex.vip/repository/maven-releases/ -DrepositoryId=release