|
@@ -75,8 +75,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
|
|
|
SysRoleIndexMapper sysRoleIndexMapper;
|
|
|
@Autowired
|
|
|
private SysUserMapper sysUserMapper;
|
|
|
-// @Autowired
|
|
|
-// ItdmPersonManageTaskMapper personManageMapper;
|
|
|
|
|
|
/**
|
|
|
* 通过角色名称查询用户VO集合
|
|
@@ -530,21 +528,16 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
|
|
|
@Override
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
public void saveUser(SysUser user, String selectedRoles, String selectedDeparts) {
|
|
|
-// String role = null;//
|
|
|
-
|
|
|
- //用户名称唯一限制
|
|
|
-
|
|
|
|
|
|
//step.1 保存用户
|
|
|
this.save(user);
|
|
|
-// SysUser u = user;
|
|
|
+
|
|
|
//step.2 保存角色
|
|
|
if(oConvertUtils.isNotEmpty(selectedRoles)) {
|
|
|
String[] arr = selectedRoles.split(",");
|
|
|
for (String roleId : arr) {
|
|
|
SysUserRole userRole = new SysUserRole(user.getId(), roleId);
|
|
|
sysUserRoleMapper.insert(userRole);
|
|
|
-// role = sysRoleMapper.selectById(roleId).getRoleName();//
|
|
|
}
|
|
|
}
|
|
|
//step.3 保存所属部门
|
|
@@ -555,17 +548,13 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
|
|
|
sysUserDepartMapper.insert(userDeaprt);
|
|
|
}
|
|
|
}
|
|
|
-// //新增用户管理
|
|
|
-// Date date = new Date();
|
|
|
-// DefaultIdentifierGenerator digester = new DefaultIdentifierGenerator();
|
|
|
-// personManageMapper.insertIntoPersonManage(String.valueOf(digester.nextId(null)),user.getRealname(),user.getSex(),user.getPhone(),role,user.getId(),date);
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
@CacheEvict(value={CacheConstant.SYS_USERS_CACHE}, allEntries=true)
|
|
|
public void editUser(SysUser user, String roles, String departs) {
|
|
|
-// String role = null;
|
|
|
+
|
|
|
//step.1 修改用户基础信息
|
|
|
this.updateById(user);
|
|
|
//step.2 修改角色
|
|
@@ -576,7 +565,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
|
|
|
for (String roleId : arr) {
|
|
|
SysUserRole userRole = new SysUserRole(user.getId(), roleId);
|
|
|
sysUserRoleMapper.insert(userRole);
|
|
|
-// role = sysRoleMapper.selectById(roleId).getRoleName(); //
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -613,9 +601,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
|
|
|
// 更新手机号、邮箱空字符串为 null
|
|
|
userMapper.updateNullByEmptyString("email");
|
|
|
userMapper.updateNullByEmptyString("phone");
|
|
|
-// //修改对应的用户管理
|
|
|
-// Date date = new Date();
|
|
|
-// personManageMapper.updatePersonManage(user.getRealname(),user.getSex(),user.getPhone(),role,user.getId(),date);
|
|
|
|
|
|
}
|
|
|
|