From b318e664b31113ddc1c45f9a116dcbcb16a319dd Mon Sep 17 00:00:00 2001 From: RuoYi Date: Fri, 4 May 2018 20:25:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/ruoyi/RuoYiApplication.java | 5 ++-- .../project/monitor/job/domain/JobLog.java | 6 ++-- .../dept/controller/DeptController.java | 1 - .../system/dept/service/IDeptService.java | 1 - .../menu/controller/MenuController.java | 13 ++++++--- .../project/system/menu/dao/IMenuDao.java | 8 ++++++ .../system/menu/service/IMenuService.java | 16 +++++++++++ .../system/menu/service/MenuServiceImpl.java | 28 +++++++++++++++++++ .../post/controller/PostController.java | 4 +++ .../system/post/service/IPostService.java | 8 ++++++ .../system/post/service/PostServiceImpl.java | 20 +++++++++++-- .../role/controller/RoleController.java | 13 +++++++-- .../project/system/role/dao/IRoleMenuDao.java | 16 +++++++++++ .../system/role/service/IRoleService.java | 8 ++++++ .../system/role/service/RoleServiceImpl.java | 18 ++++++++++-- .../user/controller/UserController.java | 4 +++ .../project/system/user/dao/IUserPostDao.java | 16 +++++++++++ .../project/system/user/dao/IUserRoleDao.java | 12 ++++++-- .../system/user/service/UserServiceImpl.java | 4 +++ .../mybatis/monitor/JobLogMapper.xml | 2 +- .../resources/mybatis/monitor/JobMapper.xml | 2 +- .../mybatis/monitor/LogininforMapper.xml | 2 +- .../mybatis/monitor/OperLogMapper.xml | 2 +- .../mybatis/system/DictDataMapper.xml | 2 +- .../mybatis/system/DictTypeMapper.xml | 2 +- .../resources/mybatis/system/MenuMapper.xml | 4 +++ .../resources/mybatis/system/PostMapper.xml | 2 +- .../resources/mybatis/system/RoleMapper.xml | 2 +- .../mybatis/system/RoleMenuMapper.xml | 13 ++++++++- .../resources/mybatis/system/UserMapper.xml | 2 +- .../mybatis/system/UserPostMapper.xml | 13 ++++++++- .../mybatis/system/UserRoleMapper.xml | 15 +++++++--- .../resources/static/ruoyi/monitor/job/job.js | 4 +-- .../static/ruoyi/monitor/job/jobLog.js | 2 +- .../ruoyi/monitor/logininfor/logininfor.js | 2 +- .../static/ruoyi/monitor/online/online.js | 2 +- .../static/ruoyi/monitor/operlog/operlog.js | 2 +- .../resources/templates/vm/html/add.html.vm | 2 +- .../resources/templates/vm/html/edit.html.vm | 2 +- .../resources/templates/vm/html/list.html.vm | 2 +- .../resources/templates/vm/xml/Mapper.xml.vm | 4 +-- 41 files changed, 238 insertions(+), 48 deletions(-) diff --git a/src/main/java/com/ruoyi/RuoYiApplication.java b/src/main/java/com/ruoyi/RuoYiApplication.java index 1e9f85d2..8d609962 100644 --- a/src/main/java/com/ruoyi/RuoYiApplication.java +++ b/src/main/java/com/ruoyi/RuoYiApplication.java @@ -2,9 +2,8 @@ package com.ruoyi; import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; +import org.springframework.transaction.annotation.EnableTransactionManagement; /** * 启动程序 @@ -12,7 +11,7 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; * @author ruoyi */ @SpringBootApplication -@EnableAutoConfiguration(exclude = { DataSourceAutoConfiguration.class }) +@EnableTransactionManagement @MapperScan("com.ruoyi.project.*.*.dao") public class RuoYiApplication { diff --git a/src/main/java/com/ruoyi/project/monitor/job/domain/JobLog.java b/src/main/java/com/ruoyi/project/monitor/job/domain/JobLog.java index 87176a71..375db904 100644 --- a/src/main/java/com/ruoyi/project/monitor/job/domain/JobLog.java +++ b/src/main/java/com/ruoyi/project/monitor/job/domain/JobLog.java @@ -11,7 +11,7 @@ import com.ruoyi.framework.web.page.PageDomain; public class JobLog extends PageDomain { /** ID */ - private Integer jobLogId; + private Long jobLogId; /** 任务名称 */ private String jobName; /** 任务组名 */ @@ -29,12 +29,12 @@ public class JobLog extends PageDomain /** 创建时间 */ private Date createTime; - public Integer getJobLogId() + public Long getJobLogId() { return jobLogId; } - public void setJobLogId(Integer jobLogId) + public void setJobLogId(Long jobLogId) { this.jobLogId = jobLogId; } diff --git a/src/main/java/com/ruoyi/project/system/dept/controller/DeptController.java b/src/main/java/com/ruoyi/project/system/dept/controller/DeptController.java index 5b03db95..f54bf8bf 100644 --- a/src/main/java/com/ruoyi/project/system/dept/controller/DeptController.java +++ b/src/main/java/com/ruoyi/project/system/dept/controller/DeptController.java @@ -102,7 +102,6 @@ public class DeptController extends BaseController { return Message.error(1, "存在下级部门,不允许删除"); } - if (deptService.checkDeptExistUser(deptId)) { return Message.error(1, "部门存在用户,不允许删除"); diff --git a/src/main/java/com/ruoyi/project/system/dept/service/IDeptService.java b/src/main/java/com/ruoyi/project/system/dept/service/IDeptService.java index 49d6ddf9..b8d83330 100644 --- a/src/main/java/com/ruoyi/project/system/dept/service/IDeptService.java +++ b/src/main/java/com/ruoyi/project/system/dept/service/IDeptService.java @@ -25,7 +25,6 @@ public interface IDeptService * @return 所有部门信息 */ public List> selectDeptTree(); - /** * 查询部门人数 diff --git a/src/main/java/com/ruoyi/project/system/menu/controller/MenuController.java b/src/main/java/com/ruoyi/project/system/menu/controller/MenuController.java index 103e2043..725e3ec4 100644 --- a/src/main/java/com/ruoyi/project/system/menu/controller/MenuController.java +++ b/src/main/java/com/ruoyi/project/system/menu/controller/MenuController.java @@ -58,14 +58,19 @@ public class MenuController extends BaseController @ResponseBody public Message remove(@PathVariable("menuId") Long menuId) { - if (menuService.deleteMenuById(menuId) > 0) + if (menuService.selectCountMenuByParentId(menuId) > 0) { - return Message.ok(); + return Message.error(1, "存在子菜单,不允许删除"); } - else + if (menuService.selectCountRoleMenuByMenuId(menuId) > 0) + { + return Message.error(1, "菜单已分配,不允许删除"); + } + if (menuService.deleteMenuById(menuId) > 0) { - return Message.error(1, "删除失败"); + return Message.ok(); } + return Message.error(); } /** diff --git a/src/main/java/com/ruoyi/project/system/menu/dao/IMenuDao.java b/src/main/java/com/ruoyi/project/system/menu/dao/IMenuDao.java index 59a1fa13..14ffe031 100644 --- a/src/main/java/com/ruoyi/project/system/menu/dao/IMenuDao.java +++ b/src/main/java/com/ruoyi/project/system/menu/dao/IMenuDao.java @@ -57,6 +57,14 @@ public interface IMenuDao * @return 菜单信息 */ public Menu selectMenuById(Long menuId); + + /** + * 查询子菜单数量 + * + * @param menuId 菜单ID + * @return 结果 + */ + public int selectCountMenuByParentId(Long parentId); /** * 新增菜单信息 diff --git a/src/main/java/com/ruoyi/project/system/menu/service/IMenuService.java b/src/main/java/com/ruoyi/project/system/menu/service/IMenuService.java index 0eb9a134..e1a25a80 100644 --- a/src/main/java/com/ruoyi/project/system/menu/service/IMenuService.java +++ b/src/main/java/com/ruoyi/project/system/menu/service/IMenuService.java @@ -76,6 +76,22 @@ public interface IMenuService */ public Menu selectMenuById(Long menuId); + /** + * 查询子菜单数量 + * + * @param menuId 菜单ID + * @return 结果 + */ + public int selectCountMenuByParentId(Long parentId); + + /** + * 查询菜单使用数量 + * + * @param menuId 菜单ID + * @return 结果 + */ + public int selectCountRoleMenuByMenuId(Long menuId); + /** * 保存菜单信息 * diff --git a/src/main/java/com/ruoyi/project/system/menu/service/MenuServiceImpl.java b/src/main/java/com/ruoyi/project/system/menu/service/MenuServiceImpl.java index b57e05d7..8fc58fed 100644 --- a/src/main/java/com/ruoyi/project/system/menu/service/MenuServiceImpl.java +++ b/src/main/java/com/ruoyi/project/system/menu/service/MenuServiceImpl.java @@ -19,6 +19,7 @@ import com.ruoyi.common.utils.TreeUtils; import com.ruoyi.common.utils.security.ShiroUtils; import com.ruoyi.project.system.menu.dao.IMenuDao; import com.ruoyi.project.system.menu.domain.Menu; +import com.ruoyi.project.system.role.dao.IRoleMenuDao; import com.ruoyi.project.system.role.domain.Role; /** @@ -34,6 +35,9 @@ public class MenuServiceImpl implements IMenuService @Autowired private IMenuDao menuDao; + @Autowired + private IRoleMenuDao roleMenuDao; + /** * 根据用户ID查询菜单 * @@ -205,6 +209,30 @@ public class MenuServiceImpl implements IMenuService return menuDao.selectMenuById(menuId); } + /** + * 查询子菜单数量 + * + * @param menuId 菜单ID + * @return 结果 + */ + @Override + public int selectCountMenuByParentId(Long parentId) + { + return menuDao.selectCountMenuByParentId(parentId); + } + + /** + * 查询菜单使用数量 + * + * @param menuId 菜单ID + * @return 结果 + */ + @Override + public int selectCountRoleMenuByMenuId(Long menuId) + { + return roleMenuDao.selectCountRoleMenuByMenuId(menuId); + } + /** * 保存菜单信息 * diff --git a/src/main/java/com/ruoyi/project/system/post/controller/PostController.java b/src/main/java/com/ruoyi/project/system/post/controller/PostController.java index 83a03f61..9adb2aa2 100644 --- a/src/main/java/com/ruoyi/project/system/post/controller/PostController.java +++ b/src/main/java/com/ruoyi/project/system/post/controller/PostController.java @@ -63,6 +63,10 @@ public class PostController extends BaseController { return Message.error("岗位不存在"); } + if (postService.selectCountPostById(postId) > 0) + { + return Message.error("岗位已分配,不能删除"); + } if (postService.deletePostById(postId) > 0) { return Message.ok(); diff --git a/src/main/java/com/ruoyi/project/system/post/service/IPostService.java b/src/main/java/com/ruoyi/project/system/post/service/IPostService.java index 882f8ab0..6bce54fb 100644 --- a/src/main/java/com/ruoyi/project/system/post/service/IPostService.java +++ b/src/main/java/com/ruoyi/project/system/post/service/IPostService.java @@ -64,4 +64,12 @@ public interface IPostService * @return 结果 */ public int savePost(Post post); + + /** + * 通过岗位ID查询岗位使用数量 + * + * @param postId 岗位ID + * @return 结果 + */ + public int selectCountPostById(Long postId); } diff --git a/src/main/java/com/ruoyi/project/system/post/service/PostServiceImpl.java b/src/main/java/com/ruoyi/project/system/post/service/PostServiceImpl.java index baaa4b85..967e9e4c 100644 --- a/src/main/java/com/ruoyi/project/system/post/service/PostServiceImpl.java +++ b/src/main/java/com/ruoyi/project/system/post/service/PostServiceImpl.java @@ -1,12 +1,15 @@ package com.ruoyi.project.system.post.service; import java.util.List; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; + import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.security.ShiroUtils; import com.ruoyi.project.system.post.dao.IPostDao; import com.ruoyi.project.system.post.domain.Post; +import com.ruoyi.project.system.user.dao.IUserPostDao; /** * 岗位信息 服务层处理 @@ -18,6 +21,9 @@ public class PostServiceImpl implements IPostService { @Autowired private IPostDao postDao; + + @Autowired + private IUserPostDao userPostDao; /** * 查询岗位信息集合 @@ -66,8 +72,6 @@ public class PostServiceImpl implements IPostService } return posts; } - - /** * 通过岗位ID查询岗位信息 @@ -131,4 +135,16 @@ public class PostServiceImpl implements IPostService return count; } + /** + * 通过岗位ID查询岗位使用数量 + * + * @param postId 岗位ID + * @return 结果 + */ + @Override + public int selectCountPostById(Long postId) + { + return userPostDao.selectCountPostById(postId); + } + } diff --git a/src/main/java/com/ruoyi/project/system/role/controller/RoleController.java b/src/main/java/com/ruoyi/project/system/role/controller/RoleController.java index 3e5f542e..72d1dc4c 100644 --- a/src/main/java/com/ruoyi/project/system/role/controller/RoleController.java +++ b/src/main/java/com/ruoyi/project/system/role/controller/RoleController.java @@ -4,6 +4,7 @@ import java.util.List; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; +import org.springframework.transaction.annotation.Transactional; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; @@ -32,7 +33,7 @@ public class RoleController extends BaseController @Autowired private IRoleService roleService; - + @RequiresPermissions("system:role:view") @GetMapping() public String role() @@ -49,7 +50,7 @@ public class RoleController extends BaseController List list = roleService.selectRoleList(role); return getDataTable(list); } - + /** * 新增角色 */ @@ -80,6 +81,7 @@ public class RoleController extends BaseController @RequiresPermissions("system:role:save") @Log(title = "系统管理", action = "角色管理-保存角色") @PostMapping("/save") + @Transactional @ResponseBody public Message save(Role role) { @@ -93,6 +95,7 @@ public class RoleController extends BaseController @RequiresPermissions("system:role:remove") @Log(title = "系统管理", action = "角色管理-删除角色") @RequestMapping("/remove/{roleId}") + @Transactional @ResponseBody public Message remove(@PathVariable("roleId") Long roleId) { @@ -101,6 +104,10 @@ public class RoleController extends BaseController { return Message.error("角色不存在"); } + if (roleService.selectCountUserRoleByRoleId(roleId) > 0) + { + return Message.error("角色已分配,不能删除"); + } if (roleService.deleteRoleById(roleId) > 0) { return Message.ok(); @@ -121,7 +128,7 @@ public class RoleController extends BaseController } return Message.error(); } - + /** * 校验角色名称 */ diff --git a/src/main/java/com/ruoyi/project/system/role/dao/IRoleMenuDao.java b/src/main/java/com/ruoyi/project/system/role/dao/IRoleMenuDao.java index 34c6ce78..ac3a9d2c 100644 --- a/src/main/java/com/ruoyi/project/system/role/dao/IRoleMenuDao.java +++ b/src/main/java/com/ruoyi/project/system/role/dao/IRoleMenuDao.java @@ -19,6 +19,22 @@ public interface IRoleMenuDao */ public int deleteRoleMenuByRoleId(Long roleId); + /** + * 批量角色角色菜单关联信息 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteRoleMenu(Long[] ids); + + /** + * 查询菜单使用数量 + * + * @param menuId 菜单ID + * @return 结果 + */ + public int selectCountRoleMenuByMenuId(Long menuId); + /** * 批量新增角色菜单信息 * diff --git a/src/main/java/com/ruoyi/project/system/role/service/IRoleService.java b/src/main/java/com/ruoyi/project/system/role/service/IRoleService.java index dbcfc690..ae92fc46 100644 --- a/src/main/java/com/ruoyi/project/system/role/service/IRoleService.java +++ b/src/main/java/com/ruoyi/project/system/role/service/IRoleService.java @@ -82,5 +82,13 @@ public interface IRoleService * @return 结果 */ public String checkRoleNameUnique(Role role); + + /** + * 通过角色ID查询角色使用数量 + * + * @param roleId 角色ID + * @return 结果 + */ + public int selectCountUserRoleByRoleId(Long roleId); } diff --git a/src/main/java/com/ruoyi/project/system/role/service/RoleServiceImpl.java b/src/main/java/com/ruoyi/project/system/role/service/RoleServiceImpl.java index 87714aa2..4a4cf3b4 100644 --- a/src/main/java/com/ruoyi/project/system/role/service/RoleServiceImpl.java +++ b/src/main/java/com/ruoyi/project/system/role/service/RoleServiceImpl.java @@ -126,7 +126,6 @@ public class RoleServiceImpl implements IRoleService @Override public int deleteRoleById(Long roleId) { - userRoleDao.deleteUserRoleByRoleId(roleId); roleMenuDao.deleteRoleMenuByRoleId(roleId); return roleDao.deleteRoleById(roleId); } @@ -140,6 +139,7 @@ public class RoleServiceImpl implements IRoleService @Override public int batchDeleteRole(Long[] ids) { + roleMenuDao.deleteRoleMenu(ids); return roleDao.batchDeleteRole(ids); } @@ -193,7 +193,7 @@ public class RoleServiceImpl implements IRoleService } return rows; } - + /** * 校验角色名称是否唯一 * @@ -205,11 +205,23 @@ public class RoleServiceImpl implements IRoleService { Long roleId = role.getRoleId(); Role info = roleDao.checkRoleNameUnique(role.getRoleName()); - if (StringUtils.isNotNull(info) && StringUtils.isNotNull(info.getRoleId()) && info.getRoleId() != roleId) + if (StringUtils.isNotNull(info) && StringUtils.isNotNull(info.getRoleId()) && info.getRoleId() != roleId) { return UserConstants.NAME_NOT_UNIQUE; } return UserConstants.NAME_UNIQUE; } + /** + * 通过角色ID查询角色使用数量 + * + * @param roleId 角色ID + * @return 结果 + */ + @Override + public int selectCountUserRoleByRoleId(Long roleId) + { + return userRoleDao.selectCountUserRoleByRoleId(roleId); + } + } diff --git a/src/main/java/com/ruoyi/project/system/user/controller/UserController.java b/src/main/java/com/ruoyi/project/system/user/controller/UserController.java index a5151e29..aa6ed211 100644 --- a/src/main/java/com/ruoyi/project/system/user/controller/UserController.java +++ b/src/main/java/com/ruoyi/project/system/user/controller/UserController.java @@ -4,6 +4,7 @@ import java.util.List; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; +import org.springframework.transaction.annotation.Transactional; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; @@ -119,6 +120,7 @@ public class UserController extends BaseController @RequiresPermissions("system:user:remove") @Log(title = "系统管理", action = "用户管理-删除用户") @RequestMapping("/remove/{userId}") + @Transactional @ResponseBody public Message remove(@PathVariable("userId") Long userId) { @@ -137,6 +139,7 @@ public class UserController extends BaseController @RequiresPermissions("system:user:batchRemove") @Log(title = "系统管理", action = "用户管理-批量删除") @PostMapping("/batchRemove") + @Transactional @ResponseBody public Message batchRemove(@RequestParam("ids[]") Long[] ids) { @@ -154,6 +157,7 @@ public class UserController extends BaseController @RequiresPermissions("system:user:save") @Log(title = "系统管理", action = "部门管理-保存部门") @PostMapping("/save") + @Transactional @ResponseBody public Message save(User user) { diff --git a/src/main/java/com/ruoyi/project/system/user/dao/IUserPostDao.java b/src/main/java/com/ruoyi/project/system/user/dao/IUserPostDao.java index 74873329..a7e94c14 100644 --- a/src/main/java/com/ruoyi/project/system/user/dao/IUserPostDao.java +++ b/src/main/java/com/ruoyi/project/system/user/dao/IUserPostDao.java @@ -18,6 +18,22 @@ public interface IUserPostDao * @return 结果 */ public int deleteUserPostByUserId(Long userId); + + /** + * 通过岗位ID查询岗位使用数量 + * + * @param postId 岗位ID + * @return 结果 + */ + public int selectCountPostById(Long postId); + + /** + * 批量删除用户和岗位关联 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteUserPost(Long[] ids); /** * 批量新增用户岗位信息 diff --git a/src/main/java/com/ruoyi/project/system/user/dao/IUserRoleDao.java b/src/main/java/com/ruoyi/project/system/user/dao/IUserRoleDao.java index 09391d0f..99b798a5 100644 --- a/src/main/java/com/ruoyi/project/system/user/dao/IUserRoleDao.java +++ b/src/main/java/com/ruoyi/project/system/user/dao/IUserRoleDao.java @@ -20,12 +20,20 @@ public interface IUserRoleDao public int deleteUserRoleByUserId(Long userId); /** - * 通过角色ID删除用户和角色关联 + * 批量删除用户和角色关联 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteUserRole(Long[] ids); + + /** + * 通过角色ID查询角色使用数量 * * @param roleId 角色ID * @return 结果 */ - public int deleteUserRoleByRoleId(Long roleId); + public int selectCountUserRoleByRoleId(Long roleId); /** * 批量新增用户角色信息 diff --git a/src/main/java/com/ruoyi/project/system/user/service/UserServiceImpl.java b/src/main/java/com/ruoyi/project/system/user/service/UserServiceImpl.java index 44ec370e..b02ccb2c 100644 --- a/src/main/java/com/ruoyi/project/system/user/service/UserServiceImpl.java +++ b/src/main/java/com/ruoyi/project/system/user/service/UserServiceImpl.java @@ -86,6 +86,8 @@ public class UserServiceImpl implements IUserService { // 删除用户与角色关联 userRoleDao.deleteUserRoleByUserId(userId); + // 删除用户与岗位表 + userPostDao.deleteUserPostByUserId(userId); return userDao.deleteUserById(userId); } @@ -98,6 +100,8 @@ public class UserServiceImpl implements IUserService @Override public int batchDeleteUser(Long[] ids) { + userRoleDao.deleteUserRole(ids); + userPostDao.deleteUserPost(ids); return userDao.batchDeleteUser(ids); } diff --git a/src/main/resources/mybatis/monitor/JobLogMapper.xml b/src/main/resources/mybatis/monitor/JobLogMapper.xml index c35db78e..ced9a988 100644 --- a/src/main/resources/mybatis/monitor/JobLogMapper.xml +++ b/src/main/resources/mybatis/monitor/JobLogMapper.xml @@ -39,7 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" delete from sys_job_log where job_log_id = #{jobLogId} - + delete from sys_job_log where job_log_id in #{jobLogId} diff --git a/src/main/resources/mybatis/monitor/JobMapper.xml b/src/main/resources/mybatis/monitor/JobMapper.xml index 50accf91..fccb300e 100644 --- a/src/main/resources/mybatis/monitor/JobMapper.xml +++ b/src/main/resources/mybatis/monitor/JobMapper.xml @@ -42,7 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" delete from sys_job where job_id = #{jobId} - + delete from sys_job where job_id in #{jobId} diff --git a/src/main/resources/mybatis/monitor/LogininforMapper.xml b/src/main/resources/mybatis/monitor/LogininforMapper.xml index c9e4d1ef..2a1e6b28 100644 --- a/src/main/resources/mybatis/monitor/LogininforMapper.xml +++ b/src/main/resources/mybatis/monitor/LogininforMapper.xml @@ -29,7 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + delete from sys_logininfor where info_id in #{infoId} diff --git a/src/main/resources/mybatis/monitor/OperLogMapper.xml b/src/main/resources/mybatis/monitor/OperLogMapper.xml index 5d65c247..4976af93 100644 --- a/src/main/resources/mybatis/monitor/OperLogMapper.xml +++ b/src/main/resources/mybatis/monitor/OperLogMapper.xml @@ -34,7 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + delete from sys_oper_log where oper_id in #{operId} diff --git a/src/main/resources/mybatis/system/DictDataMapper.xml b/src/main/resources/mybatis/system/DictDataMapper.xml index c7d877ff..619d9df6 100644 --- a/src/main/resources/mybatis/system/DictDataMapper.xml +++ b/src/main/resources/mybatis/system/DictDataMapper.xml @@ -39,7 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" delete from sys_dict_data where dict_code = #{dictCode} - + delete from sys_dict_data where dict_code in #{dictCode} diff --git a/src/main/resources/mybatis/system/DictTypeMapper.xml b/src/main/resources/mybatis/system/DictTypeMapper.xml index bbbe1119..3e466a4f 100644 --- a/src/main/resources/mybatis/system/DictTypeMapper.xml +++ b/src/main/resources/mybatis/system/DictTypeMapper.xml @@ -41,7 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" delete from sys_dict_type where dict_id = #{dictId} - + delete from sys_dict_type where dict_id in #{dictId} diff --git a/src/main/resources/mybatis/system/MenuMapper.xml b/src/main/resources/mybatis/system/MenuMapper.xml index e487281d..ec496780 100644 --- a/src/main/resources/mybatis/system/MenuMapper.xml +++ b/src/main/resources/mybatis/system/MenuMapper.xml @@ -62,6 +62,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where t.menu_id = #{menuId} + + + select count(*) from sys_role_menu where menu_id=#{menuId} + + + + delete from sys_role_menu where role_id in + + #{roleId} + + + insert into sys_role_menu(role_id, menu_id) values diff --git a/src/main/resources/mybatis/system/UserMapper.xml b/src/main/resources/mybatis/system/UserMapper.xml index 7a6f1872..cb3c2772 100644 --- a/src/main/resources/mybatis/system/UserMapper.xml +++ b/src/main/resources/mybatis/system/UserMapper.xml @@ -69,7 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" delete from sys_user where user_id = #{userId} - + delete from sys_user where user_id in #{userId} diff --git a/src/main/resources/mybatis/system/UserPostMapper.xml b/src/main/resources/mybatis/system/UserPostMapper.xml index 16c4f1d0..13ca0204 100644 --- a/src/main/resources/mybatis/system/UserPostMapper.xml +++ b/src/main/resources/mybatis/system/UserPostMapper.xml @@ -9,10 +9,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + delete from sys_user_post where user_id=#{userId} + + + + delete from sys_user_post where user_id in + + #{userId} + + + insert into sys_user_post(user_id, post_id) values diff --git a/src/main/resources/mybatis/system/UserRoleMapper.xml b/src/main/resources/mybatis/system/UserRoleMapper.xml index 1741e8ad..dadb0b42 100644 --- a/src/main/resources/mybatis/system/UserRoleMapper.xml +++ b/src/main/resources/mybatis/system/UserRoleMapper.xml @@ -9,13 +9,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + delete from sys_user_role where user_id=#{userId} - - delete from sys_user_role where role_id=#{roleId} - + + + + delete from sys_user_role where user_id in + + #{userId} + + insert into sys_user_role(user_id, role_id) values diff --git a/src/main/resources/static/ruoyi/monitor/job/job.js b/src/main/resources/static/ruoyi/monitor/job/job.js index 03cd7188..f863538e 100644 --- a/src/main/resources/static/ruoyi/monitor/job/job.js +++ b/src/main/resources/static/ruoyi/monitor/job/job.js @@ -1,4 +1,4 @@ -var prefix = ctx + "/monitor/job" +var prefix = ctx + "monitor/job" $(function() { var columns = [{ @@ -114,6 +114,6 @@ function batchRemove() { //调度日志查询 function jobLog(id) { - var url = ctx + '/monitor/jobLog'; + var url = ctx + 'monitor/jobLog'; createMenuItem(url, "调度日志"); } diff --git a/src/main/resources/static/ruoyi/monitor/job/jobLog.js b/src/main/resources/static/ruoyi/monitor/job/jobLog.js index a5c713a9..23c03593 100644 --- a/src/main/resources/static/ruoyi/monitor/job/jobLog.js +++ b/src/main/resources/static/ruoyi/monitor/job/jobLog.js @@ -1,4 +1,4 @@ -var prefix = ctx + "/monitor/jobLog" +var prefix = ctx + "monitor/jobLog" $(function() { var columns = [{ diff --git a/src/main/resources/static/ruoyi/monitor/logininfor/logininfor.js b/src/main/resources/static/ruoyi/monitor/logininfor/logininfor.js index 7cb34ebd..cceea1f3 100644 --- a/src/main/resources/static/ruoyi/monitor/logininfor/logininfor.js +++ b/src/main/resources/static/ruoyi/monitor/logininfor/logininfor.js @@ -1,4 +1,4 @@ -var prefix = ctx + "/monitor/logininfor" +var prefix = ctx + "monitor/logininfor" $(function() { var columns = [{ diff --git a/src/main/resources/static/ruoyi/monitor/online/online.js b/src/main/resources/static/ruoyi/monitor/online/online.js index 432461e9..65ed6e2e 100644 --- a/src/main/resources/static/ruoyi/monitor/online/online.js +++ b/src/main/resources/static/ruoyi/monitor/online/online.js @@ -1,4 +1,4 @@ -var prefix = ctx + "/monitor/online" +var prefix = ctx + "monitor/online" $(function() { var columns = [{ diff --git a/src/main/resources/static/ruoyi/monitor/operlog/operlog.js b/src/main/resources/static/ruoyi/monitor/operlog/operlog.js index aa4f3bd4..6ee2fcf4 100644 --- a/src/main/resources/static/ruoyi/monitor/operlog/operlog.js +++ b/src/main/resources/static/ruoyi/monitor/operlog/operlog.js @@ -1,4 +1,4 @@ -var prefix = ctx + "/monitor/operlog" +var prefix = ctx + "monitor/operlog" $(function() { var columns = [{ diff --git a/src/main/resources/templates/vm/html/add.html.vm b/src/main/resources/templates/vm/html/add.html.vm index fd1dac23..954eca5c 100644 --- a/src/main/resources/templates/vm/html/add.html.vm +++ b/src/main/resources/templates/vm/html/add.html.vm @@ -23,7 +23,7 @@
- diff --git a/src/main/resources/templates/vm/html/edit.html.vm b/src/main/resources/templates/vm/html/edit.html.vm index 3a82a28d..b7ec2bad 100644 --- a/src/main/resources/templates/vm/html/edit.html.vm +++ b/src/main/resources/templates/vm/html/edit.html.vm @@ -25,7 +25,7 @@
- diff --git a/src/main/resources/templates/vm/html/list.html.vm b/src/main/resources/templates/vm/html/list.html.vm index 13c7c34c..87c7215f 100644 --- a/src/main/resources/templates/vm/html/list.html.vm +++ b/src/main/resources/templates/vm/html/list.html.vm @@ -16,7 +16,7 @@
- +