|
|
@@ -588,8 +588,10 @@ public class SysUserServiceImpl implements ISysUserService
|
|
|
}
|
|
|
}
|
|
|
if (user.getRoleName()!=null&&!user.getRoleName().equals(u.getRoleName())){
|
|
|
+
|
|
|
SysRole sysRole = roleMapper.selectByRoleName(user.getRoleName());
|
|
|
if (sysRole !=null){
|
|
|
+ userRoleMapper.deleteUserRoleByUserId(user.getUserId());
|
|
|
List<SysUserRole> list=new ArrayList<>();
|
|
|
SysUserRole sur = new SysUserRole();
|
|
|
sur.setUserId(user.getUserId());
|
|
|
@@ -613,7 +615,7 @@ public class SysUserServiceImpl implements ISysUserService
|
|
|
{
|
|
|
failureNum++;
|
|
|
String msg = "<br/>" + failureNum + "、账号 " + user.getUserName() + " 导入失败:";
|
|
|
- failureMsg.append(msg + e.getMessage());
|
|
|
+// failureMsg.append(msg + e.getMessage());
|
|
|
log.error(msg, e);
|
|
|
}
|
|
|
}
|
|
|
@@ -659,12 +661,12 @@ public class SysUserServiceImpl implements ISysUserService
|
|
|
Long companyId = getCompany(user.getDeptId());
|
|
|
log.debug("company="+companyId);
|
|
|
SysUser sysUser = userMapper.checkJobNumber(user.getJobNumber(),companyId);
|
|
|
- if (StringUtils.isNotNull(user.getUserId())&&user.getUserId().equals(sysUser.getUserId())){
|
|
|
+ if (sysUser==null){
|
|
|
+ return false;
|
|
|
+ }else if (StringUtils.isNotNull(user.getUserId())&&user.getUserId().equals(sysUser.getUserId())){
|
|
|
return false;
|
|
|
- }else {
|
|
|
- if (sysUser!=null)return true;
|
|
|
}
|
|
|
- return false;
|
|
|
+ return true;
|
|
|
}
|
|
|
|
|
|
private Long getCompany(Long deptId) {
|