Browse Source

增加关闭多租户后,用户code为空的处理

test
smallchill 6 years ago
parent
commit
3a6d1a6dbb
  1. 3
      blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java
  2. 2
      doc/mvn/mvn命令.md

3
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<UserMapper, User> implement
if (Func.isNotEmpty(user.getPassword())) {
user.setPassword(DigestUtil.encrypt(user.getPassword()));
}
Integer cnt = baseMapper.selectCount(Wrappers.<User>query().lambda().eq(User::getTenantCode, user.getTenantCode()).eq(User::getAccount, user.getAccount()));
Integer cnt = baseMapper.selectCount(Wrappers.<User>query().lambda().eq(User::getTenantCode, Func.toStr(user.getTenantCode(), BladeConstant.ADMIN_TENANT_CODE)).eq(User::getAccount, user.getAccount()));
if (cnt > 0) {
throw new ApiException("当前用户已存在!");
}

2
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
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

Loading…
Cancel
Save