|
|
@ -35,10 +35,7 @@ import org.springblade.core.tool.constant.BladeConstant; |
|
|
|
import org.springblade.core.tool.jackson.JsonUtil; |
|
|
|
import org.springblade.core.tool.jackson.JsonUtil; |
|
|
|
import org.springblade.core.tool.support.Kv; |
|
|
|
import org.springblade.core.tool.support.Kv; |
|
|
|
import org.springblade.core.tool.utils.*; |
|
|
|
import org.springblade.core.tool.utils.*; |
|
|
|
import org.springblade.system.cache.DictCache; |
|
|
|
import org.springblade.system.cache.*; |
|
|
|
import org.springblade.system.cache.ParamCache; |
|
|
|
|
|
|
|
import org.springblade.system.cache.SysCache; |
|
|
|
|
|
|
|
import org.springblade.system.cache.UserCache; |
|
|
|
|
|
|
|
import org.springblade.system.entity.*; |
|
|
|
import org.springblade.system.entity.*; |
|
|
|
import org.springblade.system.enums.DictEnum; |
|
|
|
import org.springblade.system.enums.DictEnum; |
|
|
|
import org.springblade.system.enums.UserEnum; |
|
|
|
import org.springblade.system.enums.UserEnum; |
|
|
@ -97,6 +94,11 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement |
|
|
|
} |
|
|
|
} |
|
|
|
if (Func.isNotEmpty(user.getPassword())) { |
|
|
|
if (Func.isNotEmpty(user.getPassword())) { |
|
|
|
user.setPassword(DigestUtil.encrypt(user.getPassword())); |
|
|
|
user.setPassword(DigestUtil.encrypt(user.getPassword())); |
|
|
|
|
|
|
|
}else { |
|
|
|
|
|
|
|
String defPasswd = TenantConstant.DEFAULT_PASSWORD; |
|
|
|
|
|
|
|
user.setPassword(DigestUtil.encrypt(defPasswd)); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
Long userCount = baseMapper.selectCount(Wrappers.<User>query().lambda().eq(User::getTenantId, tenantId).eq(User::getAccount, user.getAccount())); |
|
|
|
Long userCount = baseMapper.selectCount(Wrappers.<User>query().lambda().eq(User::getTenantId, tenantId).eq(User::getAccount, user.getAccount())); |
|
|
|
if (userCount > 0L && Func.isEmpty(user.getId())) { |
|
|
|
if (userCount > 0L && Func.isEmpty(user.getId())) { |
|
|
|