Commit bcee37b8 authored by RuoYi's avatar RuoYi
Browse files

若依 1.1

parent 85c17f45
...@@ -4,9 +4,11 @@ import java.util.List; ...@@ -4,9 +4,11 @@ import java.util.List;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.exception.CustomException;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.project.system.domain.SysPost; import com.ruoyi.project.system.domain.SysPost;
import com.ruoyi.project.system.mapper.SysPostMapper; import com.ruoyi.project.system.mapper.SysPostMapper;
import com.ruoyi.project.system.mapper.SysUserPostMapper;
import com.ruoyi.project.system.service.ISysPostService; import com.ruoyi.project.system.service.ISysPostService;
/** /**
...@@ -20,6 +22,9 @@ public class SysPostServiceImpl implements ISysPostService ...@@ -20,6 +22,9 @@ public class SysPostServiceImpl implements ISysPostService
@Autowired @Autowired
private SysPostMapper postMapper; private SysPostMapper postMapper;
@Autowired
private SysUserPostMapper userPostMapper;
/** /**
* 查询岗位信息集合 * 查询岗位信息集合
* *
...@@ -66,7 +71,6 @@ public class SysPostServiceImpl implements ISysPostService ...@@ -66,7 +71,6 @@ public class SysPostServiceImpl implements ISysPostService
return postMapper.selectPostListByUserId(userId); return postMapper.selectPostListByUserId(userId);
} }
/** /**
* 校验岗位名称是否唯一 * 校验岗位名称是否唯一
* *
...@@ -103,6 +107,18 @@ public class SysPostServiceImpl implements ISysPostService ...@@ -103,6 +107,18 @@ public class SysPostServiceImpl implements ISysPostService
return UserConstants.UNIQUE; return UserConstants.UNIQUE;
} }
/**
* 通过岗位ID查询岗位使用数量
*
* @param postId 岗位ID
* @return 结果
*/
@Override
public int countUserPostById(Long postId)
{
return userPostMapper.countUserPostById(postId);
}
/** /**
* 删除岗位信息 * 删除岗位信息
* *
...@@ -115,6 +131,26 @@ public class SysPostServiceImpl implements ISysPostService ...@@ -115,6 +131,26 @@ public class SysPostServiceImpl implements ISysPostService
return postMapper.deletePostById(postId); return postMapper.deletePostById(postId);
} }
/**
* 批量删除岗位信息
*
* @param postIds 需要删除的岗位ID
* @return 结果
* @throws Exception 异常
*/
public int deletePostByIds(Long[] postIds)
{
for (Long postId : postIds)
{
SysPost post = selectPostById(postId);
if (countUserPostById(postId) > 0)
{
throw new CustomException(String.format("%1$s已分配,不能删除", post.getPostName()));
}
}
return postMapper.deletePostByIds(postIds);
}
/** /**
* 新增保存岗位信息 * 新增保存岗位信息
* *
......
...@@ -18,6 +18,7 @@ import com.ruoyi.project.system.domain.SysRoleMenu; ...@@ -18,6 +18,7 @@ import com.ruoyi.project.system.domain.SysRoleMenu;
import com.ruoyi.project.system.mapper.SysRoleDeptMapper; import com.ruoyi.project.system.mapper.SysRoleDeptMapper;
import com.ruoyi.project.system.mapper.SysRoleMapper; import com.ruoyi.project.system.mapper.SysRoleMapper;
import com.ruoyi.project.system.mapper.SysRoleMenuMapper; import com.ruoyi.project.system.mapper.SysRoleMenuMapper;
import com.ruoyi.project.system.mapper.SysUserRoleMapper;
import com.ruoyi.project.system.service.ISysRoleService; import com.ruoyi.project.system.service.ISysRoleService;
/** /**
...@@ -34,6 +35,9 @@ public class SysRoleServiceImpl implements ISysRoleService ...@@ -34,6 +35,9 @@ public class SysRoleServiceImpl implements ISysRoleService
@Autowired @Autowired
private SysRoleMenuMapper roleMenuMapper; private SysRoleMenuMapper roleMenuMapper;
@Autowired
private SysUserRoleMapper userRoleMapper;
@Autowired @Autowired
private SysRoleDeptMapper roleDeptMapper; private SysRoleDeptMapper roleDeptMapper;
...@@ -152,6 +156,18 @@ public class SysRoleServiceImpl implements ISysRoleService ...@@ -152,6 +156,18 @@ public class SysRoleServiceImpl implements ISysRoleService
} }
} }
/**
* 通过角色ID查询角色使用数量
*
* @param roleId 角色ID
* @return 结果
*/
@Override
public int countUserRoleByRoleId(Long roleId)
{
return userRoleMapper.countUserRoleByRoleId(roleId);
}
/** /**
* 新增保存角色信息 * 新增保存角色信息
* *
...@@ -272,4 +288,24 @@ public class SysRoleServiceImpl implements ISysRoleService ...@@ -272,4 +288,24 @@ public class SysRoleServiceImpl implements ISysRoleService
{ {
return roleMapper.deleteRoleById(roleId); return roleMapper.deleteRoleById(roleId);
} }
/**
* 批量删除角色信息
*
* @param roleIds 需要删除的角色ID
* @return 结果
*/
public int deleteRoleByIds(Long[] roleIds)
{
for (Long roleId : roleIds)
{
checkRoleAllowed(new SysRole(roleId));
SysRole role = selectRoleById(roleId);
if (countUserRoleByRoleId(roleId) > 0)
{
throw new CustomException(String.format("%1$s已分配,不能删除", role.getRoleName()));
}
}
return roleMapper.deleteRoleByIds(roleIds);
}
} }
...@@ -360,4 +360,19 @@ public class SysUserServiceImpl implements ISysUserService ...@@ -360,4 +360,19 @@ public class SysUserServiceImpl implements ISysUserService
userPostMapper.deleteUserPostByUserId(userId); userPostMapper.deleteUserPostByUserId(userId);
return userMapper.deleteUserById(userId); return userMapper.deleteUserById(userId);
} }
/**
* 批量删除用户信息
*
* @param userIds 需要删除的用户ID
* @return 结果
*/
public int deleteUserByIds(Long[] userIds)
{
for (Long userId : userIds)
{
checkUserAllowed(new SysUser(userId));
}
return userMapper.deleteUserByIds(userIds);
}
} }
...@@ -3,7 +3,7 @@ ruoyi: ...@@ -3,7 +3,7 @@ ruoyi:
# 名称 # 名称
name: RuoYi name: RuoYi
# 版本 # 版本
version: 1.0.0 version: 1.1.0
# 版权年份 # 版权年份
copyrightYear: 2019 copyrightYear: 2019
# 实例演示开关 # 实例演示开关
......
...@@ -42,7 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -42,7 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</where> </where>
</select> </select>
<delete id="deleteLogininforByIds" parameterType="String"> <delete id="deleteLogininforByIds" parameterType="Long">
delete from sys_logininfor where info_id in delete from sys_logininfor where info_id in
<foreach collection="array" item="infoId" open="(" separator="," close=")"> <foreach collection="array" item="infoId" open="(" separator="," close=")">
#{infoId} #{infoId}
......
...@@ -63,7 +63,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -63,7 +63,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</where> </where>
</select> </select>
<delete id="deleteOperLogByIds" parameterType="String"> <delete id="deleteOperLogByIds" parameterType="Long">
delete from sys_oper_log where oper_id in delete from sys_oper_log where oper_id in
<foreach collection="array" item="operId" open="(" separator="," close=")"> <foreach collection="array" item="operId" open="(" separator="," close=")">
#{operId} #{operId}
......
...@@ -102,4 +102,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -102,4 +102,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
delete from sys_config where config_id = #{configId} delete from sys_config where config_id = #{configId}
</delete> </delete>
<delete id="deleteConfigByIds" parameterType="Long">
delete from sys_config where config_id in
<foreach item="configId" collection="array" open="(" separator="," close=")">
#{configId}
</foreach>
</delete>
</mapper> </mapper>
\ No newline at end of file
...@@ -62,6 +62,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -62,6 +62,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<delete id="deleteDictDataById" parameterType="Long"> <delete id="deleteDictDataById" parameterType="Long">
delete from sys_dict_data where dict_code = #{dictCode} delete from sys_dict_data where dict_code = #{dictCode}
</delete> </delete>
<delete id="deleteDictDataByIds" parameterType="Long">
delete from sys_dict_data where dict_code in
<foreach collection="array" item="dictCode" open="(" separator="," close=")">
#{dictCode}
</foreach>
</delete>
<update id="updateDictData" parameterType="SysDictData"> <update id="updateDictData" parameterType="SysDictData">
update sys_dict_data update sys_dict_data
......
...@@ -63,6 +63,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -63,6 +63,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<delete id="deleteDictTypeById" parameterType="Long"> <delete id="deleteDictTypeById" parameterType="Long">
delete from sys_dict_type where dict_id = #{dictId} delete from sys_dict_type where dict_id = #{dictId}
</delete> </delete>
<delete id="deleteDictTypeByIds" parameterType="Long">
delete from sys_dict_type where dict_id in
<foreach collection="array" item="dictId" open="(" separator="," close=")">
#{dictId}
</foreach>
</delete>
<update id="updateDictType" parameterType="SysDictType"> <update id="updateDictType" parameterType="SysDictType">
update sys_dict_type update sys_dict_type
......
...@@ -79,4 +79,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -79,4 +79,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
delete from sys_notice where notice_id = #{noticeId} delete from sys_notice where notice_id = #{noticeId}
</delete> </delete>
<delete id="deleteNoticeByIds" parameterType="Long">
delete from sys_notice where notice_id in
<foreach item="noticeId" collection="array" open="(" separator="," close=")">
#{noticeId}
</foreach>
</delete>
</mapper> </mapper>
\ No newline at end of file
...@@ -111,5 +111,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -111,5 +111,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<delete id="deletePostById" parameterType="Long"> <delete id="deletePostById" parameterType="Long">
delete from sys_post where post_id = #{postId} delete from sys_post where post_id = #{postId}
</delete> </delete>
<delete id="deletePostByIds" parameterType="Long">
delete from sys_post where post_id in
<foreach collection="array" item="postId" open="(" separator="," close=")">
#{postId}
</foreach>
</delete>
</mapper> </mapper>
\ No newline at end of file
...@@ -134,4 +134,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -134,4 +134,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
delete from sys_role where role_id = #{roleId} delete from sys_role where role_id = #{roleId}
</delete> </delete>
<delete id="deleteRoleByIds" parameterType="Long">
update sys_role set del_flag = '2' where role_id in
<foreach collection="array" item="roleId" open="(" separator="," close=")">
#{roleId}
</foreach>
</delete>
</mapper> </mapper>
\ No newline at end of file
...@@ -170,5 +170,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -170,5 +170,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<delete id="deleteUserById" parameterType="Long"> <delete id="deleteUserById" parameterType="Long">
delete from sys_user where user_id = #{userId} delete from sys_user where user_id = #{userId}
</delete> </delete>
<delete id="deleteUserByIds" parameterType="Long">
update sys_user set del_flag = '2' where user_id in
<foreach collection="array" item="userId" open="(" separator="," close=")">
#{userId}
</foreach>
</delete>
</mapper> </mapper>
\ No newline at end of file
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment