若依3.2

This commit is contained in:
RuoYi
2019-01-16 14:56:27 +08:00
parent 04f2607398
commit 57fa243747
36 changed files with 1750 additions and 6685 deletions

View File

@ -114,4 +114,12 @@ public interface ISysRoleService
* @return 结果
*/
public int countUserRoleByRoleId(Long roleId);
/**
* 角色状态修改
*
* @param role 角色信息
* @return 结果
*/
public int changeStatus(SysRole role);
}

View File

@ -148,4 +148,12 @@ public interface ISysUserService
* @return 结果
*/
public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName);
/**
* 用户状态修改
*
* @param user 用户信息
* @return 结果
*/
public int changeStatus(SysUser user);
}

View File

@ -298,4 +298,16 @@ public class SysRoleServiceImpl implements ISysRoleService
{
return userRoleMapper.countUserRoleByRoleId(roleId);
}
/**
* 角色状态修改
*
* @param role 角色信息
* @return 结果
*/
@Override
public int changeStatus(SysRole role)
{
return roleMapper.updateRole(role);
}
}

View File

@ -49,7 +49,7 @@ public class SysUserServiceImpl implements ISysUserService
@Autowired
private SysUserRoleMapper userRoleMapper;
@Autowired
private ISysConfigService configService;
@ -371,6 +371,7 @@ public class SysUserServiceImpl implements ISysUserService
* @param operName 操作用户
* @return 结果
*/
@Override
public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName)
{
if (StringUtils.isNull(userList) || userList.size() == 0)
@ -428,4 +429,20 @@ public class SysUserServiceImpl implements ISysUserService
}
return successMsg.toString();
}
/**
* 用户状态修改
*
* @param user 用户信息
* @return 结果
*/
@Override
public int changeStatus(SysUser user)
{
if (SysUser.isAdmin(user.getUserId()))
{
throw new BusinessException("不允许修改超级管理员用户");
}
return userMapper.updateUser(user);
}
}