|
@@ -15,6 +15,7 @@ import org.slf4j.Logger;
|
|
import org.slf4j.LoggerFactory;
|
|
import org.slf4j.LoggerFactory;
|
|
import org.springframework.beans.BeanUtils;
|
|
import org.springframework.beans.BeanUtils;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
+import org.springframework.beans.factory.annotation.Value;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
import org.springframework.util.CollectionUtils;
|
|
import org.springframework.util.CollectionUtils;
|
|
@@ -69,6 +70,8 @@ public class SysUserServiceImpl extends JoinServiceImpl<SysUserMapper, SysUser>
|
|
protected Validator validator;
|
|
protected Validator validator;
|
|
@Autowired
|
|
@Autowired
|
|
private SysDeptMapper deptMapper;
|
|
private SysDeptMapper deptMapper;
|
|
|
|
+ @Value("${base.defaultPassword}")
|
|
|
|
+ private String defaultPassword;
|
|
|
|
|
|
/**
|
|
/**
|
|
* 根据条件分页查询用户列表
|
|
* 根据条件分页查询用户列表
|
|
@@ -539,7 +542,7 @@ public class SysUserServiceImpl extends JoinServiceImpl<SysUserMapper, SysUser>
|
|
sysUser.setUserId(IdUtils.fastSimpleUUID());
|
|
sysUser.setUserId(IdUtils.fastSimpleUUID());
|
|
SysDept sysDept = deptMapper.selectDeptByDeptName(user.getDeptName());
|
|
SysDept sysDept = deptMapper.selectDeptByDeptName(user.getDeptName());
|
|
sysUser.setDeptId(sysDept.getDeptId());
|
|
sysUser.setDeptId(sysDept.getDeptId());
|
|
- sysUser.setPassword(SecurityUtils.encryptPassword("yn5aq5Mt.106.tky"));
|
|
|
|
|
|
+ sysUser.setPassword(SecurityUtils.encryptPassword(defaultPassword));
|
|
this.insertUser(sysUser);
|
|
this.insertUser(sysUser);
|
|
SysUser sysUser1 = userMapper.selectUserByUserName(user.getUserName());
|
|
SysUser sysUser1 = userMapper.selectUserByUserName(user.getUserName());
|
|
String roleName = sysUser.getRoleName();
|
|
String roleName = sysUser.getRoleName();
|