From c79efc06ed9dfa26b7a99d30290a67db3d47bf65 Mon Sep 17 00:00:00 2001 From: zer0Black <694429613@qq.com> Date: Sun, 17 Apr 2022 17:40:14 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=88=A0=E9=99=A4=E3=80=91=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E6=89=80=E6=9C=89=E5=92=8C=E9=83=A8=E9=97=A8=E8=A7=92?= =?UTF-8?q?=E8=89=B2=E7=9B=B8=E5=85=B3=E7=9A=84=E4=BB=A3=E7=A0=81=20?= =?UTF-8?q?=E3=80=90fix=E3=80=91=E4=BF=AE=E5=A4=8D=E9=83=A8=E9=97=A8?= =?UTF-8?q?=E5=92=8C=E8=A7=92=E8=89=B2=E5=A4=84=E7=94=A8=E6=88=B7=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E4=B8=8D=E8=83=BD=E6=A8=A1=E7=B3=8A=E5=8C=B9=E9=85=8D?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=90=8D=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SysDepartPermissionController.java | 82 +-- .../controller/SysDepartRoleController.java | 588 +++++++++--------- .../system/controller/SysUserController.java | 40 +- .../modules/system/entity/SysDepartRole.java | 150 ++--- .../entity/SysDepartRolePermission.java | 134 ++-- .../system/entity/SysDepartRoleUser.java | 104 ++-- .../system/mapper/SysDepartRoleMapper.java | 46 +- .../mapper/SysDepartRolePermissionMapper.java | 34 +- .../mapper/SysDepartRoleUserMapper.java | 34 +- .../system/mapper/xml/SysDepartRoleMapper.xml | 12 - .../xml/SysDepartRolePermissionMapper.xml | 5 - .../mapper/xml/SysDepartRoleUserMapper.xml | 5 - .../ISysDepartRolePermissionService.java | 40 +- .../system/service/ISysDepartRoleService.java | 48 +- .../service/ISysDepartRoleUserService.java | 48 +- .../impl/SysDepartPermissionServiceImpl.java | 26 +- .../SysDepartRolePermissionServiceImpl.java | 174 +++--- .../impl/SysDepartRoleServiceImpl.java | 50 +- .../impl/SysDepartRoleUserServiceImpl.java | 186 +++--- .../service/impl/SysDepartServiceImpl.java | 62 +- .../impl/SysPermissionServiceImpl.java | 10 +- .../service/impl/SysUserServiceImpl.java | 16 +- jero-web/src/api/api.js | 4 +- .../system/modules/DeptRoleAuthModal.vue | 412 ++++++------ .../system/modules/DeptRoleDataruleModal.vue | 226 +++---- .../views/system/modules/SelectUserModal.vue | 2 +- .../system/modules/SysDepartRoleModal.vue | 300 ++++----- 27 files changed, 1408 insertions(+), 1430 deletions(-) delete mode 100644 jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysDepartRoleMapper.xml delete mode 100644 jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysDepartRolePermissionMapper.xml delete mode 100644 jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysDepartRoleUserMapper.xml diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartPermissionController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartPermissionController.java index e5bc5e51..2e3c8408 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartPermissionController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartPermissionController.java @@ -13,7 +13,7 @@ import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.query.QueryGenerator; import com.jero.common.util.oConvertUtils; import com.jero.modules.system.entity.SysDepartPermission; -import com.jero.modules.system.entity.SysDepartRolePermission; +//import com.jero.modules.system.entity.SysDepartRolePermission; import com.jero.modules.system.entity.SysPermission; import com.jero.modules.system.entity.SysPermissionDataRule; import com.jero.modules.system.model.TreeModel; @@ -22,7 +22,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; -import com.jero.modules.system.service.ISysDepartRolePermissionService; +//import com.jero.modules.system.service.ISysDepartRolePermissionService; import com.jero.modules.system.service.ISysPermissionDataRuleService; import com.jero.modules.system.service.ISysPermissionService; @@ -52,8 +52,8 @@ public class SysDepartPermissionController extends JeroController> queryDeptRolePermission(@RequestParam(name = "roleId", required = true) String roleId) { - Result> result = new Result<>(); - try { - List list = sysDepartRolePermissionService.list(new QueryWrapper().lambda().eq(SysDepartRolePermission::getRoleId, roleId)); - result.setResult(list.stream().map(SysDepartRolePermission -> String.valueOf(SysDepartRolePermission.getPermissionId())).collect(Collectors.toList())); - result.setSuccess(true); - } catch (Exception e) { - log.error(e.getMessage(), e); - } - return result; - } +// /** +// * 查询角色授权 +// * +// * @return +// */ +// @RequestMapping(value = "/queryDeptRolePermission", method = RequestMethod.GET) +// public Result> queryDeptRolePermission(@RequestParam(name = "roleId", required = true) String roleId) { +// Result> result = new Result<>(); +// try { +// List list = sysDepartRolePermissionService.list(new QueryWrapper().lambda().eq(SysDepartRolePermission::getRoleId, roleId)); +// result.setResult(list.stream().map(SysDepartRolePermission -> String.valueOf(SysDepartRolePermission.getPermissionId())).collect(Collectors.toList())); +// result.setSuccess(true); +// } catch (Exception e) { +// log.error(e.getMessage(), e); +// } +// return result; +// } - /** - * 保存角色授权 - * - * @return - */ - @RequestMapping(value = "/saveDeptRolePermission", method = RequestMethod.POST) - public Result saveDeptRolePermission(@RequestBody JSONObject json) { - long start = System.currentTimeMillis(); - try { - String roleId = json.getString("roleId"); - String permissionIds = json.getString("permissionIds"); - String lastPermissionIds = json.getString("lastpermissionIds"); - this.sysDepartRolePermissionService.saveDeptRolePermission(roleId, permissionIds, lastPermissionIds); - log.info("======部门角色授权成功=====耗时:" + (System.currentTimeMillis() - start) + "毫秒"); - return Result.OK("保存成功！"); - } catch (Exception e) { - log.error(e.getMessage(), e); - return Result.error500("授权失败！"); - } - } +// /** +// * 保存角色授权 +// * +// * @return +// */ +// @RequestMapping(value = "/saveDeptRolePermission", method = RequestMethod.POST) +// public Result saveDeptRolePermission(@RequestBody JSONObject json) { +// long start = System.currentTimeMillis(); +// try { +// String roleId = json.getString("roleId"); +// String permissionIds = json.getString("permissionIds"); +// String lastPermissionIds = json.getString("lastpermissionIds"); +// this.sysDepartRolePermissionService.saveDeptRolePermission(roleId, permissionIds, lastPermissionIds); +// log.info("======部门角色授权成功=====耗时:" + (System.currentTimeMillis() - start) + "毫秒"); +// return Result.OK("保存成功！"); +// } catch (Exception e) { +// log.error(e.getMessage(), e); +// return Result.error500("授权失败！"); +// } +// } /** * 用户角色授权功能，查询菜单权限树 diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartRoleController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartRoleController.java index 3e486e16..6b8a4f97 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartRoleController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartRoleController.java @@ -1,294 +1,294 @@ -package com.jero.modules.system.controller; - -import java.util.*; -import java.util.stream.Collectors; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.jero.common.system.base.controller.JeroController; -import org.apache.shiro.SecurityUtils; -import com.jero.common.api.vo.Result; -import com.jero.common.system.query.QueryGenerator; -import com.jero.common.aspect.annotation.AutoLog; -import com.jero.common.system.vo.LoginUser; -import com.jero.common.util.oConvertUtils; -import com.jero.modules.system.entity.*; -import com.jero.modules.system.service.*; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.extern.slf4j.Slf4j; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.servlet.ModelAndView; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; - - /** - * @Description: 部门角色 - * @Author: jero-boot - * @Date: 2020-02-12 - * @Version: V1.0 - */ -@Slf4j -@Api(tags="部门角色") -@RestController -@RequestMapping("/sys/sysDepartRole") -public class SysDepartRoleController extends JeroController { - @Autowired - private ISysDepartRoleService sysDepartRoleService; - - @Autowired - private ISysDepartRoleUserService departRoleUserService; - - @Autowired - private ISysDepartPermissionService sysDepartPermissionService; - - @Autowired - private ISysDepartRolePermissionService sysDepartRolePermissionService; - - @Autowired - private ISysDepartService sysDepartService; - - /** - * 分页列表查询 - * - * @param sysDepartRole - * @param pageNo - * @param pageSize - * @param req - * @return - */ - @ApiOperation(value="部门角色-分页列表查询", notes="部门角色-分页列表查询") - @GetMapping(value = "/page") - public Result queryPageList(SysDepartRole sysDepartRole, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - @RequestParam(name="deptId",required=false) String deptId, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(sysDepartRole, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - List deptIds = null; -// if(oConvertUtils.isEmpty(deptId)){ -// if(oConvertUtils.isNotEmpty(user.getUserIdentity()) && user.getUserIdentity().equals(CommonConstant.USER_IDENTITY_2) ){ -// deptIds = sysDepartService.getMySubDepIdsByDepId(user.getDepartIds()); -// }else{ -// return Result.OK(null); -// } -// }else{ -// deptIds = sysDepartService.getSubDepIdsByDepId(deptId); -// } -// queryWrapper.in("depart_id",deptIds); - - //我的部门，选中部门只能看当前部门下的角色 - queryWrapper.eq("depart_id",deptId); - IPage pageList = sysDepartRoleService.page(page, queryWrapper); - return Result.OK(pageList); - } - - /** - * 添加 - * - * @param sysDepartRole - * @return - */ - //@RequiresRoles({"admin"}) - @ApiOperation(value="部门角色-添加", notes="部门角色-添加") - @PostMapping(value = "/add") - public Result add(@RequestBody SysDepartRole sysDepartRole) { - sysDepartRoleService.save(sysDepartRole); - return Result.OK("添加成功！"); - } - - /** - * 编辑 - * - * @param sysDepartRole - * @return - */ - //@RequiresRoles({"admin"}) - @ApiOperation(value="部门角色-编辑", notes="部门角色-编辑") - @PutMapping(value = "/edit") - public Result edit(@RequestBody SysDepartRole sysDepartRole) { - sysDepartRoleService.updateById(sysDepartRole); - return Result.OK("编辑成功!"); - } - - /** - * 通过id删除 - * - * @param id - * @return - */ - //@RequiresRoles({"admin"}) - @AutoLog(value = "部门角色-通过id删除") - @ApiOperation(value="部门角色-通过id删除", notes="部门角色-通过id删除") - @DeleteMapping(value = "/delete") - public Result delete(@RequestParam(name="id",required=true) String id) { - sysDepartRoleService.removeById(id); - return Result.OK("删除成功!"); - } - - /** - * 批量删除 - * - * @param ids - * @return - */ - //@RequiresRoles({"admin"}) - @AutoLog(value = "部门角色-批量删除") - @ApiOperation(value="部门角色-批量删除", notes="部门角色-批量删除") - @DeleteMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { - this.sysDepartRoleService.removeByIds(Arrays.asList(ids.split(","))); - return Result.OK("批量删除成功！"); - } - - /** - * 通过id查询 - * - * @param id - * @return - */ - @ApiOperation(value="部门角色-通过id查询", notes="部门角色-通过id查询") - @GetMapping(value = "/queryById") - public Result queryById(@RequestParam(name="id",required=true) String id) { - SysDepartRole sysDepartRole = sysDepartRoleService.getById(id); - return Result.OK(sysDepartRole); - } - - /** - * 获取部门下角色 - * @param departId - * @return - */ - @RequestMapping(value = "/getDeptRoleList", method = RequestMethod.GET) - public Result> getDeptRoleList(@RequestParam(value = "departId") String departId,@RequestParam(value = "userId") String userId){ - Result> result = new Result<>(); - //查询选中部门的角色 - List deptRoleList = sysDepartRoleService.list(new LambdaQueryWrapper().eq(SysDepartRole::getDepartId,departId)); - result.setSuccess(true); - result.setResult(deptRoleList); - return result; - } - - /** - * 设置 - * @param json - * @return - */ - //@RequiresRoles({"admin"}) - @RequestMapping(value = "/deptRoleUserAdd", method = RequestMethod.POST) - public Result deptRoleAdd(@RequestBody JSONObject json) { - String newRoleId = json.getString("newRoleId"); - String oldRoleId = json.getString("oldRoleId"); - String userId = json.getString("userId"); - departRoleUserService.deptRoleUserAdd(userId,newRoleId,oldRoleId); - return Result.OK("添加成功！"); - } - - /** - * 根据用户id获取已设置部门角色 - * @param userId - * @return - */ - @RequestMapping(value = "/getDeptRoleByUserId", method = RequestMethod.GET) - public Result> getDeptRoleByUserId(@RequestParam(value = "userId") String userId,@RequestParam(value = "departId") String departId){ - Result> result = new Result<>(); - //查询部门下角色 - List roleList = sysDepartRoleService.list(new QueryWrapper().eq("depart_id",departId)); - List roleIds = roleList.stream().map(SysDepartRole::getId).collect(Collectors.toList()); - //根据角色id,用户id查询已授权角色 - List roleUserList = null; - if(roleIds!=null && roleIds.size()>0){ - roleUserList = departRoleUserService.list(new QueryWrapper().eq("user_id",userId).in("drole_id",roleIds)); - } - result.setSuccess(true); - result.setResult(roleUserList); - return result; - } - - /** - * 查询数据规则数据 - */ - @GetMapping(value = "/datarule/{permissionId}/{departId}/{roleId}") - public Result loadDatarule(@PathVariable("permissionId") String permissionId,@PathVariable("departId") String departId,@PathVariable("roleId") String roleId) { - //查询已授权的部门规则 - List list = sysDepartPermissionService.getPermRuleListByDeptIdAndPermId(departId,permissionId); - if(list==null || list.size()==0) { - return Result.error("未找到权限配置信息"); - }else { - Map map = new HashMap<>(); - map.put("datarule", list); - LambdaQueryWrapper query = new LambdaQueryWrapper() - .eq(SysDepartRolePermission::getPermissionId, permissionId) - .eq(SysDepartRolePermission::getRoleId,roleId); - SysDepartRolePermission sysRolePermission = sysDepartRolePermissionService.getOne(query); - if(sysRolePermission==null) { - //return Result.error("未找到角色菜单配置信息"); - }else { - String drChecked = sysRolePermission.getDataRuleIds(); - if(oConvertUtils.isNotEmpty(drChecked)) { - map.put("drChecked", drChecked.endsWith(",")?drChecked.substring(0, drChecked.length()-1):drChecked); - } - } - return Result.OK(map); - //TODO 以后按钮权限的查询也走这个请求 无非在map中多加两个key - } - } - - /** - * 保存数据规则至角色菜单关联表 - */ - @PostMapping(value = "/datarule") - public Result saveDatarule(@RequestBody JSONObject jsonObject) { - try { - String permissionId = jsonObject.getString("permissionId"); - String roleId = jsonObject.getString("roleId"); - String dataRuleIds = jsonObject.getString("dataRuleIds"); - log.info("保存数据规则>>"+"菜单ID:"+permissionId+"角色ID:"+ roleId+"数据权限ID:"+dataRuleIds); - LambdaQueryWrapper query = new LambdaQueryWrapper() - .eq(SysDepartRolePermission::getPermissionId, permissionId) - .eq(SysDepartRolePermission::getRoleId,roleId); - SysDepartRolePermission sysRolePermission = sysDepartRolePermissionService.getOne(query); - if(sysRolePermission==null) { - return Result.error("请先保存角色菜单权限!"); - }else { - sysRolePermission.setDataRuleIds(dataRuleIds); - this.sysDepartRolePermissionService.updateById(sysRolePermission); - } - } catch (Exception e) { - log.error("SysRoleController.saveDatarule()发生异常：" + e.getMessage(),e); - return Result.error("保存失败"); - } - return Result.OK("保存成功!"); - } - - /** - * 导出excel - * - * @param request - * @param sysDepartRole - */ - @RequestMapping(value = "/exportXls") - public ModelAndView exportXls(HttpServletRequest request, SysDepartRole sysDepartRole) { - return super.exportXls(request, sysDepartRole, SysDepartRole.class, "部门角色"); - } - - /** - * 通过excel导入数据 - * - * @param request - * @param response - * @return - */ - @RequestMapping(value = "/importExcel", method = RequestMethod.POST) - public Result importExcel(HttpServletRequest request, HttpServletResponse response) { - return super.importExcel(request, response, SysDepartRole.class); - } - -} +//package com.jero.modules.system.controller; +// +//import java.util.*; +//import java.util.stream.Collectors; +//import javax.servlet.http.HttpServletRequest; +//import javax.servlet.http.HttpServletResponse; +// +//import com.alibaba.fastjson.JSONObject; +//import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +//import com.jero.common.system.base.controller.JeroController; +//import org.apache.shiro.SecurityUtils; +//import com.jero.common.api.vo.Result; +//import com.jero.common.system.query.QueryGenerator; +//import com.jero.common.aspect.annotation.AutoLog; +//import com.jero.common.system.vo.LoginUser; +//import com.jero.common.util.oConvertUtils; +//import com.jero.modules.system.entity.*; +//import com.jero.modules.system.service.*; +//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +//import com.baomidou.mybatisplus.core.metadata.IPage; +//import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +//import lombok.extern.slf4j.Slf4j; +// +//import org.springframework.beans.factory.annotation.Autowired; +//import org.springframework.web.bind.annotation.*; +//import org.springframework.web.servlet.ModelAndView; +//import io.swagger.annotations.Api; +//import io.swagger.annotations.ApiOperation; +// +// /** +// * @Description: 部门角色 +// * @Author: jero-boot +// * @Date: 2020-02-12 +// * @Version: V1.0 +// */ +//@Slf4j +//@Api(tags="部门角色") +//@RestController +//@RequestMapping("/sys/sysDepartRole") +//public class SysDepartRoleController extends JeroController { +// @Autowired +// private ISysDepartRoleService sysDepartRoleService; +// +// @Autowired +// private ISysDepartRoleUserService departRoleUserService; +// +// @Autowired +// private ISysDepartPermissionService sysDepartPermissionService; +// +// @Autowired +// private ISysDepartRolePermissionService sysDepartRolePermissionService; +// +// @Autowired +// private ISysDepartService sysDepartService; +// +// /** +// * 分页列表查询 +// * +// * @param sysDepartRole +// * @param pageNo +// * @param pageSize +// * @param req +// * @return +// */ +// @ApiOperation(value="部门角色-分页列表查询", notes="部门角色-分页列表查询") +// @GetMapping(value = "/page") +// public Result queryPageList(SysDepartRole sysDepartRole, +// @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, +// @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, +// @RequestParam(name="deptId",required=false) String deptId, +// HttpServletRequest req) { +// QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(sysDepartRole, req.getParameterMap()); +// Page page = new Page(pageNo, pageSize); +// LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); +// List deptIds = null; +//// if(oConvertUtils.isEmpty(deptId)){ +//// if(oConvertUtils.isNotEmpty(user.getUserIdentity()) && user.getUserIdentity().equals(CommonConstant.USER_IDENTITY_2) ){ +//// deptIds = sysDepartService.getMySubDepIdsByDepId(user.getDepartIds()); +//// }else{ +//// return Result.OK(null); +//// } +//// }else{ +//// deptIds = sysDepartService.getSubDepIdsByDepId(deptId); +//// } +//// queryWrapper.in("depart_id",deptIds); +// +// //我的部门，选中部门只能看当前部门下的角色 +// queryWrapper.eq("depart_id",deptId); +// IPage pageList = sysDepartRoleService.page(page, queryWrapper); +// return Result.OK(pageList); +// } +// +// /** +// * 添加 +// * +// * @param sysDepartRole +// * @return +// */ +// //@RequiresRoles({"admin"}) +// @ApiOperation(value="部门角色-添加", notes="部门角色-添加") +// @PostMapping(value = "/add") +// public Result add(@RequestBody SysDepartRole sysDepartRole) { +// sysDepartRoleService.save(sysDepartRole); +// return Result.OK("添加成功！"); +// } +// +// /** +// * 编辑 +// * +// * @param sysDepartRole +// * @return +// */ +// //@RequiresRoles({"admin"}) +// @ApiOperation(value="部门角色-编辑", notes="部门角色-编辑") +// @PutMapping(value = "/edit") +// public Result edit(@RequestBody SysDepartRole sysDepartRole) { +// sysDepartRoleService.updateById(sysDepartRole); +// return Result.OK("编辑成功!"); +// } +// +// /** +// * 通过id删除 +// * +// * @param id +// * @return +// */ +// //@RequiresRoles({"admin"}) +// @AutoLog(value = "部门角色-通过id删除") +// @ApiOperation(value="部门角色-通过id删除", notes="部门角色-通过id删除") +// @DeleteMapping(value = "/delete") +// public Result delete(@RequestParam(name="id",required=true) String id) { +// sysDepartRoleService.removeById(id); +// return Result.OK("删除成功!"); +// } +// +// /** +// * 批量删除 +// * +// * @param ids +// * @return +// */ +// //@RequiresRoles({"admin"}) +// @AutoLog(value = "部门角色-批量删除") +// @ApiOperation(value="部门角色-批量删除", notes="部门角色-批量删除") +// @DeleteMapping(value = "/deleteBatch") +// public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { +// this.sysDepartRoleService.removeByIds(Arrays.asList(ids.split(","))); +// return Result.OK("批量删除成功！"); +// } +// +// /** +// * 通过id查询 +// * +// * @param id +// * @return +// */ +// @ApiOperation(value="部门角色-通过id查询", notes="部门角色-通过id查询") +// @GetMapping(value = "/queryById") +// public Result queryById(@RequestParam(name="id",required=true) String id) { +// SysDepartRole sysDepartRole = sysDepartRoleService.getById(id); +// return Result.OK(sysDepartRole); +// } +// +// /** +// * 获取部门下角色 +// * @param departId +// * @return +// */ +// @RequestMapping(value = "/getDeptRoleList", method = RequestMethod.GET) +// public Result> getDeptRoleList(@RequestParam(value = "departId") String departId,@RequestParam(value = "userId") String userId){ +// Result> result = new Result<>(); +// //查询选中部门的角色 +// List deptRoleList = sysDepartRoleService.list(new LambdaQueryWrapper().eq(SysDepartRole::getDepartId,departId)); +// result.setSuccess(true); +// result.setResult(deptRoleList); +// return result; +// } +// +// /** +// * 设置 +// * @param json +// * @return +// */ +// //@RequiresRoles({"admin"}) +// @RequestMapping(value = "/deptRoleUserAdd", method = RequestMethod.POST) +// public Result deptRoleAdd(@RequestBody JSONObject json) { +// String newRoleId = json.getString("newRoleId"); +// String oldRoleId = json.getString("oldRoleId"); +// String userId = json.getString("userId"); +// departRoleUserService.deptRoleUserAdd(userId,newRoleId,oldRoleId); +// return Result.OK("添加成功！"); +// } +// +// /** +// * 根据用户id获取已设置部门角色 +// * @param userId +// * @return +// */ +// @RequestMapping(value = "/getDeptRoleByUserId", method = RequestMethod.GET) +// public Result> getDeptRoleByUserId(@RequestParam(value = "userId") String userId,@RequestParam(value = "departId") String departId){ +// Result> result = new Result<>(); +// //查询部门下角色 +// List roleList = sysDepartRoleService.list(new QueryWrapper().eq("depart_id",departId)); +// List roleIds = roleList.stream().map(SysDepartRole::getId).collect(Collectors.toList()); +// //根据角色id,用户id查询已授权角色 +// List roleUserList = null; +// if(roleIds!=null && roleIds.size()>0){ +// roleUserList = departRoleUserService.list(new QueryWrapper().eq("user_id",userId).in("drole_id",roleIds)); +// } +// result.setSuccess(true); +// result.setResult(roleUserList); +// return result; +// } +// +// /** +// * 查询数据规则数据 +// */ +// @GetMapping(value = "/datarule/{permissionId}/{departId}/{roleId}") +// public Result loadDatarule(@PathVariable("permissionId") String permissionId,@PathVariable("departId") String departId,@PathVariable("roleId") String roleId) { +// //查询已授权的部门规则 +// List list = sysDepartPermissionService.getPermRuleListByDeptIdAndPermId(departId,permissionId); +// if(list==null || list.size()==0) { +// return Result.error("未找到权限配置信息"); +// }else { +// Map map = new HashMap<>(); +// map.put("datarule", list); +// LambdaQueryWrapper query = new LambdaQueryWrapper() +// .eq(SysDepartRolePermission::getPermissionId, permissionId) +// .eq(SysDepartRolePermission::getRoleId,roleId); +// SysDepartRolePermission sysRolePermission = sysDepartRolePermissionService.getOne(query); +// if(sysRolePermission==null) { +// //return Result.error("未找到角色菜单配置信息"); +// }else { +// String drChecked = sysRolePermission.getDataRuleIds(); +// if(oConvertUtils.isNotEmpty(drChecked)) { +// map.put("drChecked", drChecked.endsWith(",")?drChecked.substring(0, drChecked.length()-1):drChecked); +// } +// } +// return Result.OK(map); +// //TODO 以后按钮权限的查询也走这个请求 无非在map中多加两个key +// } +// } +// +// /** +// * 保存数据规则至角色菜单关联表 +// */ +// @PostMapping(value = "/datarule") +// public Result saveDatarule(@RequestBody JSONObject jsonObject) { +// try { +// String permissionId = jsonObject.getString("permissionId"); +// String roleId = jsonObject.getString("roleId"); +// String dataRuleIds = jsonObject.getString("dataRuleIds"); +// log.info("保存数据规则>>"+"菜单ID:"+permissionId+"角色ID:"+ roleId+"数据权限ID:"+dataRuleIds); +// LambdaQueryWrapper query = new LambdaQueryWrapper() +// .eq(SysDepartRolePermission::getPermissionId, permissionId) +// .eq(SysDepartRolePermission::getRoleId,roleId); +// SysDepartRolePermission sysRolePermission = sysDepartRolePermissionService.getOne(query); +// if(sysRolePermission==null) { +// return Result.error("请先保存角色菜单权限!"); +// }else { +// sysRolePermission.setDataRuleIds(dataRuleIds); +// this.sysDepartRolePermissionService.updateById(sysRolePermission); +// } +// } catch (Exception e) { +// log.error("SysRoleController.saveDatarule()发生异常：" + e.getMessage(),e); +// return Result.error("保存失败"); +// } +// return Result.OK("保存成功!"); +// } +// +// /** +// * 导出excel +// * +// * @param request +// * @param sysDepartRole +// */ +// @RequestMapping(value = "/exportXls") +// public ModelAndView exportXls(HttpServletRequest request, SysDepartRole sysDepartRole) { +// return super.exportXls(request, sysDepartRole, SysDepartRole.class, "部门角色"); +// } +// +// /** +// * 通过excel导入数据 +// * +// * @param request +// * @param response +// * @return +// */ +// @RequestMapping(value = "/importExcel", method = RequestMethod.POST) +// public Result importExcel(HttpServletRequest request, HttpServletResponse response) { +// return super.importExcel(request, response, SysDepartRole.class); +// } +// +//} diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java index a7ca9060..b55e10b7 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java @@ -82,11 +82,11 @@ public class SysUserController { @Autowired private ISysUserRoleService userRoleService; - @Autowired - private ISysDepartRoleUserService departRoleUserService; +// @Autowired +// private ISysDepartRoleUserService departRoleUserService; - @Autowired - private ISysDepartRoleService departRoleService; +// @Autowired +// private ISysDepartRoleService departRoleService; @Autowired private RedisUtil redisUtil; @@ -779,19 +779,19 @@ public class SysUserController { try { QueryWrapper queryWrapper = new QueryWrapper(); queryWrapper.eq("dep_id", depId).eq("user_id",userId); - boolean b = sysUserDepartService.remove(queryWrapper); - if(b){ - List sysDepartRoleList = departRoleService.list(new QueryWrapper().eq("depart_id",depId)); - List roleIds = sysDepartRoleList.stream().map(SysDepartRole::getId).collect(Collectors.toList()); - if(roleIds != null && roleIds.size()>0){ - QueryWrapper query = new QueryWrapper<>(); - query.eq("user_id",userId).in("drole_id",roleIds); - departRoleUserService.remove(query); - } + sysUserDepartService.remove(queryWrapper); +// if(b){ +// List sysDepartRoleList = departRoleService.list(new QueryWrapper().eq("depart_id",depId)); +// List roleIds = sysDepartRoleList.stream().map(SysDepartRole::getId).collect(Collectors.toList()); +// if(roleIds != null && roleIds.size()>0){ +// QueryWrapper query = new QueryWrapper<>(); +// query.eq("user_id",userId).in("drole_id",roleIds); +// departRoleUserService.remove(query); +// } return Result.OK("删除成功!"); - }else{ - return Result.error500("当前选中部门与用户无关联关系!"); - } +// }else{ +// return Result.error500("当前选中部门与用户无关联关系!"); +// } }catch(Exception e) { log.error(e.getMessage(), e); return Result.error500("删除失败！"); @@ -808,10 +808,10 @@ public class SysUserController { try { QueryWrapper queryWrapper = new QueryWrapper(); queryWrapper.eq("dep_id", depId).in("user_id",Arrays.asList(userIds.split(","))); - boolean b = sysUserDepartService.remove(queryWrapper); - if(b){ - departRoleUserService.removeDeptRoleUser(Arrays.asList(userIds.split(",")),depId); - } + sysUserDepartService.remove(queryWrapper); +// if(b){ +// departRoleUserService.removeDeptRoleUser(Arrays.asList(userIds.split(",")),depId); +// } return Result.OK("删除成功!"); }catch(Exception e) { log.error(e.getMessage(), e); diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDepartRole.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDepartRole.java index 51f23ae1..cf330749 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDepartRole.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDepartRole.java @@ -1,75 +1,75 @@ -package com.jero.modules.system.entity; - -import java.io.Serializable; -import java.util.Date; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.TableField; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.jero.common.aspect.annotation.Dict; -import org.springframework.format.annotation.DateTimeFormat; -import org.jeecgframework.poi.excel.annotation.Excel; - -/** - * @Description: 部门角色 - * @Author: jero-boot - * @Date: 2020-02-12 - * @Version: V1.0 - */ -@Data -@TableName("sys_depart_role") -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -@ApiModel(value="sys_depart_role对象", description="部门角色") -public class SysDepartRole { - - /**id*/ - @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty(value = "id") - private java.lang.String id; - /**部门id*/ - @Excel(name = "部门id", width = 15) - @ApiModelProperty(value = "部门id") - @Dict(dictTable ="sys_depart",dicText = "depart_name",dicCode = "id") - private java.lang.String departId; - /**部门角色名称*/ - @Excel(name = "部门角色名称", width = 15) - @ApiModelProperty(value = "部门角色名称") - private java.lang.String roleName; - /**部门角色编码*/ - @Excel(name = "部门角色编码", width = 15) - @ApiModelProperty(value = "部门角色编码") - private java.lang.String roleCode; - /**描述*/ - @Excel(name = "描述", width = 15) - @ApiModelProperty(value = "描述") - private java.lang.String description; - /**创建人*/ - @Excel(name = "创建人", width = 15) - @ApiModelProperty(value = "创建人") - private java.lang.String createBy; - /**创建时间*/ - @Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value = "创建时间") - private java.util.Date createTime; - /**更新人*/ - @Excel(name = "更新人", width = 15) - @ApiModelProperty(value = "更新人") - private java.lang.String updateBy; - /**更新时间*/ - @Excel(name = "更新时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value = "更新时间") - private java.util.Date updateTime; - - -} +//package com.jero.modules.system.entity; +// +//import java.io.Serializable; +//import java.util.Date; +//import com.baomidou.mybatisplus.annotation.IdType; +//import com.baomidou.mybatisplus.annotation.TableId; +//import com.baomidou.mybatisplus.annotation.TableName; +//import com.baomidou.mybatisplus.annotation.TableField; +//import io.swagger.annotations.ApiModel; +//import io.swagger.annotations.ApiModelProperty; +//import lombok.Data; +//import lombok.EqualsAndHashCode; +//import lombok.experimental.Accessors; +//import com.fasterxml.jackson.annotation.JsonFormat; +//import com.jero.common.aspect.annotation.Dict; +//import org.springframework.format.annotation.DateTimeFormat; +//import org.jeecgframework.poi.excel.annotation.Excel; +// +///** +// * @Description: 部门角色 +// * @Author: jero-boot +// * @Date: 2020-02-12 +// * @Version: V1.0 +// */ +//@Data +//@TableName("sys_depart_role") +//@EqualsAndHashCode(callSuper = false) +//@Accessors(chain = true) +//@ApiModel(value="sys_depart_role对象", description="部门角色") +//public class SysDepartRole { +// +// /**id*/ +// @TableId(type = IdType.ASSIGN_ID) +// @ApiModelProperty(value = "id") +// private java.lang.String id; +// /**部门id*/ +// @Excel(name = "部门id", width = 15) +// @ApiModelProperty(value = "部门id") +// @Dict(dictTable ="sys_depart",dicText = "depart_name",dicCode = "id") +// private java.lang.String departId; +// /**部门角色名称*/ +// @Excel(name = "部门角色名称", width = 15) +// @ApiModelProperty(value = "部门角色名称") +// private java.lang.String roleName; +// /**部门角色编码*/ +// @Excel(name = "部门角色编码", width = 15) +// @ApiModelProperty(value = "部门角色编码") +// private java.lang.String roleCode; +// /**描述*/ +// @Excel(name = "描述", width = 15) +// @ApiModelProperty(value = "描述") +// private java.lang.String description; +// /**创建人*/ +// @Excel(name = "创建人", width = 15) +// @ApiModelProperty(value = "创建人") +// private java.lang.String createBy; +// /**创建时间*/ +// @Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") +// @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") +// @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") +// @ApiModelProperty(value = "创建时间") +// private java.util.Date createTime; +// /**更新人*/ +// @Excel(name = "更新人", width = 15) +// @ApiModelProperty(value = "更新人") +// private java.lang.String updateBy; +// /**更新时间*/ +// @Excel(name = "更新时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") +// @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") +// @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") +// @ApiModelProperty(value = "更新时间") +// private java.util.Date updateTime; +// +// +//} diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDepartRolePermission.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDepartRolePermission.java index 80e6aeb7..14bad255 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDepartRolePermission.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDepartRolePermission.java @@ -1,67 +1,67 @@ -package com.jero.modules.system.entity; - -import java.io.Serializable; -import java.util.Date; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.TableField; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import com.fasterxml.jackson.annotation.JsonFormat; -import org.springframework.format.annotation.DateTimeFormat; -import org.jeecgframework.poi.excel.annotation.Excel; - -/** - * @Description: 部门角色权限 - * @Author: jero-boot - * @Date: 2020-02-12 - * @Version: V1.0 - */ -@Data -@TableName("sys_depart_role_permission") -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -@ApiModel(value="sys_depart_role_permission对象", description="部门角色权限") -public class SysDepartRolePermission { - - /**id*/ - @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty(value = "id") - private java.lang.String id; - /**部门id*/ - @Excel(name = "部门id", width = 15) - @ApiModelProperty(value = "部门id") - private java.lang.String departId; - /**角色id*/ - @Excel(name = "角色id", width = 15) - @ApiModelProperty(value = "角色id") - private java.lang.String roleId; - /**权限id*/ - @Excel(name = "权限id", width = 15) - @ApiModelProperty(value = "权限id") - private java.lang.String permissionId; - /**dataRuleIds*/ - @Excel(name = "dataRuleIds", width = 15) - @ApiModelProperty(value = "dataRuleIds") - private java.lang.String dataRuleIds; - /** 操作时间 */ - @Excel(name = "操作时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value = "操作时间") - private java.util.Date operateDate; - /** 操作ip */ - private java.lang.String operateIp; - - public SysDepartRolePermission() { - } - - public SysDepartRolePermission(String roleId, String permissionId) { - this.roleId = roleId; - this.permissionId = permissionId; - } -} +//package com.jero.modules.system.entity; +// +//import java.io.Serializable; +//import java.util.Date; +//import com.baomidou.mybatisplus.annotation.IdType; +//import com.baomidou.mybatisplus.annotation.TableId; +//import com.baomidou.mybatisplus.annotation.TableName; +//import com.baomidou.mybatisplus.annotation.TableField; +//import io.swagger.annotations.ApiModel; +//import io.swagger.annotations.ApiModelProperty; +//import lombok.Data; +//import lombok.EqualsAndHashCode; +//import lombok.experimental.Accessors; +//import com.fasterxml.jackson.annotation.JsonFormat; +//import org.springframework.format.annotation.DateTimeFormat; +//import org.jeecgframework.poi.excel.annotation.Excel; +// +///** +// * @Description: 部门角色权限 +// * @Author: jero-boot +// * @Date: 2020-02-12 +// * @Version: V1.0 +// */ +//@Data +//@TableName("sys_depart_role_permission") +//@EqualsAndHashCode(callSuper = false) +//@Accessors(chain = true) +//@ApiModel(value="sys_depart_role_permission对象", description="部门角色权限") +//public class SysDepartRolePermission { +// +// /**id*/ +// @TableId(type = IdType.ASSIGN_ID) +// @ApiModelProperty(value = "id") +// private java.lang.String id; +// /**部门id*/ +// @Excel(name = "部门id", width = 15) +// @ApiModelProperty(value = "部门id") +// private java.lang.String departId; +// /**角色id*/ +// @Excel(name = "角色id", width = 15) +// @ApiModelProperty(value = "角色id") +// private java.lang.String roleId; +// /**权限id*/ +// @Excel(name = "权限id", width = 15) +// @ApiModelProperty(value = "权限id") +// private java.lang.String permissionId; +// /**dataRuleIds*/ +// @Excel(name = "dataRuleIds", width = 15) +// @ApiModelProperty(value = "dataRuleIds") +// private java.lang.String dataRuleIds; +// /** 操作时间 */ +// @Excel(name = "操作时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") +// @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") +// @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") +// @ApiModelProperty(value = "操作时间") +// private java.util.Date operateDate; +// /** 操作ip */ +// private java.lang.String operateIp; +// +// public SysDepartRolePermission() { +// } +// +// public SysDepartRolePermission(String roleId, String permissionId) { +// this.roleId = roleId; +// this.permissionId = permissionId; +// } +//} diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDepartRoleUser.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDepartRoleUser.java index 7a5b2985..c889109d 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDepartRoleUser.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDepartRoleUser.java @@ -1,52 +1,52 @@ -package com.jero.modules.system.entity; - -import java.io.Serializable; -import java.util.Date; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.TableField; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import com.fasterxml.jackson.annotation.JsonFormat; -import org.springframework.format.annotation.DateTimeFormat; -import org.jeecgframework.poi.excel.annotation.Excel; - -/** - * @Description: 部门角色人员信息 - * @Author: jero-boot - * @Date: 2020-02-13 - * @Version: V1.0 - */ -@Data -@TableName("sys_depart_role_user") -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -@ApiModel(value="sys_depart_role_user对象", description="部门角色人员信息") -public class SysDepartRoleUser { - - /**主键id*/ - @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty(value = "主键id") - private java.lang.String id; - /**用户id*/ - @Excel(name = "用户id", width = 15) - @ApiModelProperty(value = "用户id") - private java.lang.String userId; - /**角色id*/ - @Excel(name = "角色id", width = 15) - @ApiModelProperty(value = "角色id") - private java.lang.String droleId; - - public SysDepartRoleUser() { - - } - - public SysDepartRoleUser(String userId, String droleId) { - this.userId = userId; - this.droleId = droleId; - } -} +//package com.jero.modules.system.entity; +// +//import java.io.Serializable; +//import java.util.Date; +//import com.baomidou.mybatisplus.annotation.IdType; +//import com.baomidou.mybatisplus.annotation.TableId; +//import com.baomidou.mybatisplus.annotation.TableName; +//import com.baomidou.mybatisplus.annotation.TableField; +//import io.swagger.annotations.ApiModel; +//import io.swagger.annotations.ApiModelProperty; +//import lombok.Data; +//import lombok.EqualsAndHashCode; +//import lombok.experimental.Accessors; +//import com.fasterxml.jackson.annotation.JsonFormat; +//import org.springframework.format.annotation.DateTimeFormat; +//import org.jeecgframework.poi.excel.annotation.Excel; +// +///** +// * @Description: 部门角色人员信息 +// * @Author: jero-boot +// * @Date: 2020-02-13 +// * @Version: V1.0 +// */ +//@Data +//@TableName("sys_depart_role_user") +//@EqualsAndHashCode(callSuper = false) +//@Accessors(chain = true) +//@ApiModel(value="sys_depart_role_user对象", description="部门角色人员信息") +//public class SysDepartRoleUser { +// +// /**主键id*/ +// @TableId(type = IdType.ASSIGN_ID) +// @ApiModelProperty(value = "主键id") +// private java.lang.String id; +// /**用户id*/ +// @Excel(name = "用户id", width = 15) +// @ApiModelProperty(value = "用户id") +// private java.lang.String userId; +// /**角色id*/ +// @Excel(name = "角色id", width = 15) +// @ApiModelProperty(value = "角色id") +// private java.lang.String droleId; +// +// public SysDepartRoleUser() { +// +// } +// +// public SysDepartRoleUser(String userId, String droleId) { +// this.userId = userId; +// this.droleId = droleId; +// } +//} diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDepartRoleMapper.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDepartRoleMapper.java index f828560b..0c48a38d 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDepartRoleMapper.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDepartRoleMapper.java @@ -1,23 +1,23 @@ -package com.jero.modules.system.mapper; - -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import com.jero.modules.system.entity.SysDepartRole; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * @Description: 部门角色 - * @Author: jero-boot - * @Date: 2020-02-12 - * @Version: V1.0 - */ -public interface SysDepartRoleMapper extends BaseMapper { - /** - * 根据用户id，部门id查询可授权所有部门角色 - * @param orgCode - * @param userId - * @return - */ - public List queryDeptRoleByDeptAndUser(@Param("orgCode") String orgCode, @Param("userId") String userId); -} +//package com.jero.modules.system.mapper; +// +//import java.util.List; +// +//import org.apache.ibatis.annotations.Param; +//import com.jero.modules.system.entity.SysDepartRole; +//import com.baomidou.mybatisplus.core.mapper.BaseMapper; +// +///** +// * @Description: 部门角色 +// * @Author: jero-boot +// * @Date: 2020-02-12 +// * @Version: V1.0 +// */ +//public interface SysDepartRoleMapper extends BaseMapper { +// /** +// * 根据用户id，部门id查询可授权所有部门角色 +// * @param orgCode +// * @param userId +// * @return +// */ +// public List queryDeptRoleByDeptAndUser(@Param("orgCode") String orgCode, @Param("userId") String userId); +//} diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDepartRolePermissionMapper.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDepartRolePermissionMapper.java index 66f1f8c9..75c33c20 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDepartRolePermissionMapper.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDepartRolePermissionMapper.java @@ -1,17 +1,17 @@ -package com.jero.modules.system.mapper; - -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import com.jero.modules.system.entity.SysDepartRolePermission; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * @Description: 部门角色权限 - * @Author: jero-boot - * @Date: 2020-02-12 - * @Version: V1.0 - */ -public interface SysDepartRolePermissionMapper extends BaseMapper { - -} +//package com.jero.modules.system.mapper; +// +//import java.util.List; +// +//import org.apache.ibatis.annotations.Param; +//import com.jero.modules.system.entity.SysDepartRolePermission; +//import com.baomidou.mybatisplus.core.mapper.BaseMapper; +// +///** +// * @Description: 部门角色权限 +// * @Author: jero-boot +// * @Date: 2020-02-12 +// * @Version: V1.0 +// */ +//public interface SysDepartRolePermissionMapper extends BaseMapper { +// +//} diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDepartRoleUserMapper.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDepartRoleUserMapper.java index d3796d3d..391624a7 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDepartRoleUserMapper.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDepartRoleUserMapper.java @@ -1,17 +1,17 @@ -package com.jero.modules.system.mapper; - -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import com.jero.modules.system.entity.SysDepartRoleUser; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * @Description: 部门角色人员信息 - * @Author: jero-boot - * @Date: 2020-02-13 - * @Version: V1.0 - */ -public interface SysDepartRoleUserMapper extends BaseMapper { - -} +//package com.jero.modules.system.mapper; +// +//import java.util.List; +// +//import org.apache.ibatis.annotations.Param; +//import com.jero.modules.system.entity.SysDepartRoleUser; +//import com.baomidou.mybatisplus.core.mapper.BaseMapper; +// +///** +// * @Description: 部门角色人员信息 +// * @Author: jero-boot +// * @Date: 2020-02-13 +// * @Version: V1.0 +// */ +//public interface SysDepartRoleUserMapper extends BaseMapper { +// +//} diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysDepartRoleMapper.xml b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysDepartRoleMapper.xml deleted file mode 100644 index ba2e85fc..00000000 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysDepartRoleMapper.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysDepartRolePermissionMapper.xml b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysDepartRolePermissionMapper.xml deleted file mode 100644 index 38a6e1df..00000000 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysDepartRolePermissionMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysDepartRoleUserMapper.xml b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysDepartRoleUserMapper.xml deleted file mode 100644 index acde2573..00000000 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysDepartRoleUserMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDepartRolePermissionService.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDepartRolePermissionService.java index f434fa60..99ee9a4f 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDepartRolePermissionService.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDepartRolePermissionService.java @@ -1,20 +1,20 @@ -package com.jero.modules.system.service; - -import com.jero.modules.system.entity.SysDepartRolePermission; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - * @Description: 部门角色权限 - * @Author: jero-boot - * @Date: 2020-02-12 - * @Version: V1.0 - */ -public interface ISysDepartRolePermissionService extends IService { - /** - * 保存授权 将上次的权限和这次作比较 差异处理提高效率 - * @param roleId - * @param permissionIds - * @param lastPermissionIds - */ - public void saveDeptRolePermission(String roleId,String permissionIds,String lastPermissionIds); -} +//package com.jero.modules.system.service; +// +//import com.jero.modules.system.entity.SysDepartRolePermission; +//import com.baomidou.mybatisplus.extension.service.IService; +// +///** +// * @Description: 部门角色权限 +// * @Author: jero-boot +// * @Date: 2020-02-12 +// * @Version: V1.0 +// */ +//public interface ISysDepartRolePermissionService extends IService { +// /** +// * 保存授权 将上次的权限和这次作比较 差异处理提高效率 +// * @param roleId +// * @param permissionIds +// * @param lastPermissionIds +// */ +// public void saveDeptRolePermission(String roleId,String permissionIds,String lastPermissionIds); +//} diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDepartRoleService.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDepartRoleService.java index 1a307ccd..cf506c20 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDepartRoleService.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDepartRoleService.java @@ -1,24 +1,24 @@ -package com.jero.modules.system.service; - -import com.jero.modules.system.entity.SysDepartRole; -import com.baomidou.mybatisplus.extension.service.IService; - -import java.util.List; - -/** - * @Description: 部门角色 - * @Author: jero-boot - * @Date: 2020-02-12 - * @Version: V1.0 - */ -public interface ISysDepartRoleService extends IService { - - /** - * 根据用户id，部门id查询可授权所有部门角色 - * @param orgCode - * @param userId - * @return - */ - List queryDeptRoleByDeptAndUser(String orgCode, String userId); - -} +//package com.jero.modules.system.service; +// +//import com.jero.modules.system.entity.SysDepartRole; +//import com.baomidou.mybatisplus.extension.service.IService; +// +//import java.util.List; +// +///** +// * @Description: 部门角色 +// * @Author: jero-boot +// * @Date: 2020-02-12 +// * @Version: V1.0 +// */ +//public interface ISysDepartRoleService extends IService { +// +// /** +// * 根据用户id，部门id查询可授权所有部门角色 +// * @param orgCode +// * @param userId +// * @return +// */ +// List queryDeptRoleByDeptAndUser(String orgCode, String userId); +// +//} diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDepartRoleUserService.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDepartRoleUserService.java index cc168726..31d14ca6 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDepartRoleUserService.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDepartRoleUserService.java @@ -1,24 +1,24 @@ -package com.jero.modules.system.service; - -import com.jero.modules.system.entity.SysDepartRoleUser; -import com.baomidou.mybatisplus.extension.service.IService; - -import java.util.List; - -/** - * @Description: 部门角色人员信息 - * @Author: jero-boot - * @Date: 2020-02-13 - * @Version: V1.0 - */ -public interface ISysDepartRoleUserService extends IService { - - void deptRoleUserAdd(String userId,String newRoleId,String oldRoleId); - - /** - * 取消用户与部门关联，删除关联关系 - * @param userIds - * @param depId - */ - void removeDeptRoleUser(List userIds,String depId); -} +//package com.jero.modules.system.service; +// +//import com.jero.modules.system.entity.SysDepartRoleUser; +//import com.baomidou.mybatisplus.extension.service.IService; +// +//import java.util.List; +// +///** +// * @Description: 部门角色人员信息 +// * @Author: jero-boot +// * @Date: 2020-02-13 +// * @Version: V1.0 +// */ +//public interface ISysDepartRoleUserService extends IService { +// +// void deptRoleUserAdd(String userId,String newRoleId,String oldRoleId); +// +// /** +// * 取消用户与部门关联，删除关联关系 +// * @param userIds +// * @param depId +// */ +// void removeDeptRoleUser(List userIds,String depId); +//} diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartPermissionServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartPermissionServiceImpl.java index 032b0697..1878bce7 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartPermissionServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartPermissionServiceImpl.java @@ -4,12 +4,12 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.jero.common.util.oConvertUtils; import com.jero.modules.system.entity.SysDepartPermission; -import com.jero.modules.system.entity.SysDepartRole; -import com.jero.modules.system.entity.SysDepartRolePermission; +//import com.jero.modules.system.entity.SysDepartRole; +//import com.jero.modules.system.entity.SysDepartRolePermission; import com.jero.modules.system.entity.SysPermissionDataRule; import com.jero.modules.system.mapper.SysDepartPermissionMapper; -import com.jero.modules.system.mapper.SysDepartRoleMapper; -import com.jero.modules.system.mapper.SysDepartRolePermissionMapper; +//import com.jero.modules.system.mapper.SysDepartRoleMapper; +//import com.jero.modules.system.mapper.SysDepartRolePermissionMapper; import com.jero.modules.system.mapper.SysPermissionDataRuleMapper; import com.jero.modules.system.service.ISysDepartPermissionService; import org.springframework.stereotype.Service; @@ -32,11 +32,11 @@ public class SysDepartPermissionServiceImpl extends ServiceImpl().lambda().eq(SysDepartPermission::getDepartId, departId).eq(SysDepartPermission::getPermissionId, permissionId)); //删除部门权限时，删除部门角色中已授权的权限 - List sysDepartRoleList = sysDepartRoleMapper.selectList(new LambdaQueryWrapper().eq(SysDepartRole::getDepartId,departId)); - List roleIds = sysDepartRoleList.stream().map(SysDepartRole::getId).collect(Collectors.toList()); - if(roleIds != null && roleIds.size()>0){ - departRolePermissionMapper.delete(new LambdaQueryWrapper().eq(SysDepartRolePermission::getPermissionId,permissionId)); - } +// List sysDepartRoleList = sysDepartRoleMapper.selectList(new LambdaQueryWrapper().eq(SysDepartRole::getDepartId,departId)); +// List roleIds = sysDepartRoleList.stream().map(SysDepartRole::getId).collect(Collectors.toList()); +// if(roleIds != null && roleIds.size()>0){ +// departRolePermissionMapper.delete(new LambdaQueryWrapper().eq(SysDepartRolePermission::getPermissionId,permissionId)); +// } } } } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartRolePermissionServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartRolePermissionServiceImpl.java index 3bf3d7ef..ea108fb2 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartRolePermissionServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartRolePermissionServiceImpl.java @@ -1,87 +1,87 @@ -package com.jero.modules.system.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.jero.common.util.IPUtils; -import com.jero.common.util.SpringContextUtils; -import com.jero.common.util.oConvertUtils; -import com.jero.modules.system.entity.SysDepartRolePermission; -import com.jero.modules.system.mapper.SysDepartRolePermissionMapper; -import com.jero.modules.system.service.ISysDepartRolePermissionService; -import org.springframework.stereotype.Service; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - -import javax.servlet.http.HttpServletRequest; -import java.util.*; - -/** - * @Description: 部门角色权限 - * @Author: jero-boot - * @Date: 2020-02-12 - * @Version: V1.0 - */ -@Service -public class SysDepartRolePermissionServiceImpl extends ServiceImpl implements ISysDepartRolePermissionService { - - @Override - public void saveDeptRolePermission(String roleId, String permissionIds, String lastPermissionIds) { - String ip = ""; - try { - //获取request - HttpServletRequest request = SpringContextUtils.getHttpServletRequest(); - //获取IP地址 - ip = IPUtils.getIpAddr(request); - } catch (Exception e) { - ip = "127.0.0.1"; - } - List add = getDiff(lastPermissionIds,permissionIds); - if(add!=null && add.size()>0) { - List list = new ArrayList(); - for (String p : add) { - if(oConvertUtils.isNotEmpty(p)) { - SysDepartRolePermission rolepms = new SysDepartRolePermission(roleId, p); - rolepms.setOperateDate(new Date()); - rolepms.setOperateIp(ip); - list.add(rolepms); - } - } - this.saveBatch(list); - } - - List delete = getDiff(permissionIds,lastPermissionIds); - if(delete!=null && delete.size()>0) { - for (String permissionId : delete) { - this.remove(new QueryWrapper().lambda().eq(SysDepartRolePermission::getRoleId, roleId).eq(SysDepartRolePermission::getPermissionId, permissionId)); - } - } - } - - /** - * 从diff中找出main中没有的元素 - * @param main - * @param diff - * @return - */ - private List getDiff(String main, String diff){ - if(oConvertUtils.isEmpty(diff)) { - return null; - } - if(oConvertUtils.isEmpty(main)) { - return Arrays.asList(diff.split(",")); - } - - String[] mainArr = main.split(","); - String[] diffArr = diff.split(","); - Map map = new HashMap<>(); - for (String string : mainArr) { - map.put(string, 1); - } - List res = new ArrayList(); - for (String key : diffArr) { - if(oConvertUtils.isNotEmpty(key) && !map.containsKey(key)) { - res.add(key); - } - } - return res; - } -} +//package com.jero.modules.system.service.impl; +// +//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +//import com.jero.common.util.IPUtils; +//import com.jero.common.util.SpringContextUtils; +//import com.jero.common.util.oConvertUtils; +//import com.jero.modules.system.entity.SysDepartRolePermission; +//import com.jero.modules.system.mapper.SysDepartRolePermissionMapper; +//import com.jero.modules.system.service.ISysDepartRolePermissionService; +//import org.springframework.stereotype.Service; +// +//import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +// +//import javax.servlet.http.HttpServletRequest; +//import java.util.*; +// +///** +// * @Description: 部门角色权限 +// * @Author: jero-boot +// * @Date: 2020-02-12 +// * @Version: V1.0 +// */ +//@Service +//public class SysDepartRolePermissionServiceImpl extends ServiceImpl implements ISysDepartRolePermissionService { +// +// @Override +// public void saveDeptRolePermission(String roleId, String permissionIds, String lastPermissionIds) { +// String ip = ""; +// try { +// //获取request +// HttpServletRequest request = SpringContextUtils.getHttpServletRequest(); +// //获取IP地址 +// ip = IPUtils.getIpAddr(request); +// } catch (Exception e) { +// ip = "127.0.0.1"; +// } +// List add = getDiff(lastPermissionIds,permissionIds); +// if(add!=null && add.size()>0) { +// List list = new ArrayList(); +// for (String p : add) { +// if(oConvertUtils.isNotEmpty(p)) { +// SysDepartRolePermission rolepms = new SysDepartRolePermission(roleId, p); +// rolepms.setOperateDate(new Date()); +// rolepms.setOperateIp(ip); +// list.add(rolepms); +// } +// } +// this.saveBatch(list); +// } +// +// List delete = getDiff(permissionIds,lastPermissionIds); +// if(delete!=null && delete.size()>0) { +// for (String permissionId : delete) { +// this.remove(new QueryWrapper().lambda().eq(SysDepartRolePermission::getRoleId, roleId).eq(SysDepartRolePermission::getPermissionId, permissionId)); +// } +// } +// } +// +// /** +// * 从diff中找出main中没有的元素 +// * @param main +// * @param diff +// * @return +// */ +// private List getDiff(String main, String diff){ +// if(oConvertUtils.isEmpty(diff)) { +// return null; +// } +// if(oConvertUtils.isEmpty(main)) { +// return Arrays.asList(diff.split(",")); +// } +// +// String[] mainArr = main.split(","); +// String[] diffArr = diff.split(","); +// Map map = new HashMap<>(); +// for (String string : mainArr) { +// map.put(string, 1); +// } +// List res = new ArrayList(); +// for (String key : diffArr) { +// if(oConvertUtils.isNotEmpty(key) && !map.containsKey(key)) { +// res.add(key); +// } +// } +// return res; +// } +//} diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartRoleServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartRoleServiceImpl.java index a3f859a2..146ea66b 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartRoleServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartRoleServiceImpl.java @@ -1,25 +1,25 @@ -package com.jero.modules.system.service.impl; - -import com.jero.modules.system.entity.SysDepartRole; -import com.jero.modules.system.mapper.SysDepartRoleMapper; -import com.jero.modules.system.service.ISysDepartRoleService; -import org.springframework.stereotype.Service; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - -import java.util.List; - -/** - * @Description: 部门角色 - * @Author: jero-boot - * @Date: 2020-02-12 - * @Version: V1.0 - */ -@Service -public class SysDepartRoleServiceImpl extends ServiceImpl implements ISysDepartRoleService { - - @Override - public List queryDeptRoleByDeptAndUser(String orgCode, String userId) { - return this.baseMapper.queryDeptRoleByDeptAndUser(orgCode,userId); - } -} +//package com.jero.modules.system.service.impl; +// +//import com.jero.modules.system.entity.SysDepartRole; +//import com.jero.modules.system.mapper.SysDepartRoleMapper; +//import com.jero.modules.system.service.ISysDepartRoleService; +//import org.springframework.stereotype.Service; +// +//import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +// +//import java.util.List; +// +///** +// * @Description: 部门角色 +// * @Author: jero-boot +// * @Date: 2020-02-12 +// * @Version: V1.0 +// */ +//@Service +//public class SysDepartRoleServiceImpl extends ServiceImpl implements ISysDepartRoleService { +// +// @Override +// public List queryDeptRoleByDeptAndUser(String orgCode, String userId) { +// return this.baseMapper.queryDeptRoleByDeptAndUser(orgCode,userId); +// } +//} diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartRoleUserServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartRoleUserServiceImpl.java index 900a850d..96006b0a 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartRoleUserServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartRoleUserServiceImpl.java @@ -1,93 +1,93 @@ -package com.jero.modules.system.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.jero.common.util.oConvertUtils; -import com.jero.modules.system.entity.SysDepartRole; -import com.jero.modules.system.entity.SysDepartRoleUser; -import com.jero.modules.system.mapper.SysDepartRoleMapper; -import com.jero.modules.system.mapper.SysDepartRoleUserMapper; -import com.jero.modules.system.service.ISysDepartRoleUserService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.transaction.annotation.Transactional; - -import java.util.*; -import java.util.stream.Collectors; - -/** - * @Description: 部门角色人员信息 - * @Author: jero-boot - * @Date: 2020-02-13 - * @Version: V1.0 - */ -@Service -public class SysDepartRoleUserServiceImpl extends ServiceImpl implements ISysDepartRoleUserService { - @Autowired - private SysDepartRoleMapper sysDepartRoleMapper; - - @Override - public void deptRoleUserAdd(String userId, String newRoleId, String oldRoleId) { - List add = getDiff(oldRoleId,newRoleId); - if(add!=null && add.size()>0) { - List list = new ArrayList<>(); - for (String roleId : add) { - if(oConvertUtils.isNotEmpty(roleId)) { - SysDepartRoleUser rolepms = new SysDepartRoleUser(userId, roleId); - list.add(rolepms); - } - } - this.saveBatch(list); - } - List remove = getDiff(newRoleId,oldRoleId); - if(remove!=null && remove.size()>0) { - for (String roleId : remove) { - this.remove(new QueryWrapper().lambda().eq(SysDepartRoleUser::getUserId, userId).eq(SysDepartRoleUser::getDroleId, roleId)); - } - } - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void removeDeptRoleUser(List userIds, String depId) { - for(String userId : userIds){ - List sysDepartRoleList = sysDepartRoleMapper.selectList(new QueryWrapper().eq("depart_id",depId)); - List roleIds = sysDepartRoleList.stream().map(SysDepartRole::getId).collect(Collectors.toList()); - if(roleIds != null && roleIds.size()>0){ - QueryWrapper query = new QueryWrapper<>(); - query.eq("user_id",userId).in("drole_id",roleIds); - this.remove(query); - } - } - } - - /** - * 从diff中找出main中没有的元素 - * @param main - * @param diff - * @return - */ - private List getDiff(String main, String diff){ - if(oConvertUtils.isEmpty(diff)) { - return null; - } - if(oConvertUtils.isEmpty(main)) { - return Arrays.asList(diff.split(",")); - } - - String[] mainArr = main.split(","); - String[] diffArr = diff.split(","); - Map map = new HashMap<>(); - for (String string : mainArr) { - map.put(string, 1); - } - List res = new ArrayList(); - for (String key : diffArr) { - if(oConvertUtils.isNotEmpty(key) && !map.containsKey(key)) { - res.add(key); - } - } - return res; - } -} +//package com.jero.modules.system.service.impl; +// +//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +//import com.jero.common.util.oConvertUtils; +//import com.jero.modules.system.entity.SysDepartRole; +//import com.jero.modules.system.entity.SysDepartRoleUser; +//import com.jero.modules.system.mapper.SysDepartRoleMapper; +//import com.jero.modules.system.mapper.SysDepartRoleUserMapper; +//import com.jero.modules.system.service.ISysDepartRoleUserService; +//import org.springframework.beans.factory.annotation.Autowired; +//import org.springframework.stereotype.Service; +// +//import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +//import org.springframework.transaction.annotation.Transactional; +// +//import java.util.*; +//import java.util.stream.Collectors; +// +///** +// * @Description: 部门角色人员信息 +// * @Author: jero-boot +// * @Date: 2020-02-13 +// * @Version: V1.0 +// */ +//@Service +//public class SysDepartRoleUserServiceImpl extends ServiceImpl implements ISysDepartRoleUserService { +// @Autowired +// private SysDepartRoleMapper sysDepartRoleMapper; +// +// @Override +// public void deptRoleUserAdd(String userId, String newRoleId, String oldRoleId) { +// List add = getDiff(oldRoleId,newRoleId); +// if(add!=null && add.size()>0) { +// List list = new ArrayList<>(); +// for (String roleId : add) { +// if(oConvertUtils.isNotEmpty(roleId)) { +// SysDepartRoleUser rolepms = new SysDepartRoleUser(userId, roleId); +// list.add(rolepms); +// } +// } +// this.saveBatch(list); +// } +// List remove = getDiff(newRoleId,oldRoleId); +// if(remove!=null && remove.size()>0) { +// for (String roleId : remove) { +// this.remove(new QueryWrapper().lambda().eq(SysDepartRoleUser::getUserId, userId).eq(SysDepartRoleUser::getDroleId, roleId)); +// } +// } +// } +// +// @Override +// @Transactional(rollbackFor = Exception.class) +// public void removeDeptRoleUser(List userIds, String depId) { +// for(String userId : userIds){ +// List sysDepartRoleList = sysDepartRoleMapper.selectList(new QueryWrapper().eq("depart_id",depId)); +// List roleIds = sysDepartRoleList.stream().map(SysDepartRole::getId).collect(Collectors.toList()); +// if(roleIds != null && roleIds.size()>0){ +// QueryWrapper query = new QueryWrapper<>(); +// query.eq("user_id",userId).in("drole_id",roleIds); +// this.remove(query); +// } +// } +// } +// +// /** +// * 从diff中找出main中没有的元素 +// * @param main +// * @param diff +// * @return +// */ +// private List getDiff(String main, String diff){ +// if(oConvertUtils.isEmpty(diff)) { +// return null; +// } +// if(oConvertUtils.isEmpty(main)) { +// return Arrays.asList(diff.split(",")); +// } +// +// String[] mainArr = main.split(","); +// String[] diffArr = diff.split(","); +// Map map = new HashMap<>(); +// for (String string : mainArr) { +// map.put(string, 1); +// } +// List res = new ArrayList(); +// for (String key : diffArr) { +// if(oConvertUtils.isNotEmpty(key) && !map.containsKey(key)) { +// res.add(key); +// } +// } +// return res; +// } +//} diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartServiceImpl.java index 379185f5..ada18292 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartServiceImpl.java @@ -41,14 +41,14 @@ public class SysDepartServiceImpl extends ServiceImpl roleIdList = new ArrayList<>(); - LambdaQueryWrapper query = new LambdaQueryWrapper<>(); - query.select(SysDepartRole::getId).in(SysDepartRole::getDepartId, idList); - List depRoleList = sysDepartRoleMapper.selectList(query); - for(SysDepartRole deptRole : depRoleList){ - roleIdList.add(deptRole.getId()); - } +// LambdaQueryWrapper query = new LambdaQueryWrapper<>(); +// query.select(SysDepartRole::getId).in(SysDepartRole::getDepartId, idList); +// List depRoleList = sysDepartRoleMapper.selectList(query); +// for(SysDepartRole deptRole : depRoleList){ +// roleIdList.add(deptRole.getId()); +// } //根据部门id删除用户与部门关系 userDepartMapper.delete(new LambdaQueryWrapper().in(SysUserDepart::getDepId,idList)); //根据部门id删除部门授权 departPermissionMapper.delete(new LambdaQueryWrapper().in(SysDepartPermission::getDepartId,idList)); //根据部门id删除部门角色 - sysDepartRoleMapper.delete(new LambdaQueryWrapper().in(SysDepartRole::getDepartId,idList)); - if(roleIdList != null && roleIdList.size()>0){ +// sysDepartRoleMapper.delete(new LambdaQueryWrapper().in(SysDepartRole::getDepartId,idList)); +// if(roleIdList != null && roleIdList.size()>0){ //根据角色id删除部门角色授权 - departRolePermissionMapper.delete(new LambdaQueryWrapper().in(SysDepartRolePermission::getRoleId,roleIdList)); +// departRolePermissionMapper.delete(new LambdaQueryWrapper().in(SysDepartRolePermission::getRoleId,roleIdList)); //根据角色id删除部门角色用户信息 - departRoleUserMapper.delete(new LambdaQueryWrapper().in(SysDepartRoleUser::getDroleId,roleIdList)); - } +// departRoleUserMapper.delete(new LambdaQueryWrapper().in(SysDepartRoleUser::getDroleId,roleIdList)); +// } } @Override @@ -329,25 +329,25 @@ public class SysDepartServiceImpl extends ServiceImpl roleIdList = new ArrayList<>(); - LambdaQueryWrapper query = new LambdaQueryWrapper<>(); - query.select(SysDepartRole::getId).in(SysDepartRole::getDepartId, idList); - List depRoleList = sysDepartRoleMapper.selectList(query); - for(SysDepartRole deptRole : depRoleList){ - roleIdList.add(deptRole.getId()); - } +// List roleIdList = new ArrayList<>(); +// LambdaQueryWrapper query = new LambdaQueryWrapper<>(); +// query.select(SysDepartRole::getId).in(SysDepartRole::getDepartId, idList); +// List depRoleList = sysDepartRoleMapper.selectList(query); +// for(SysDepartRole deptRole : depRoleList){ +// roleIdList.add(deptRole.getId()); +// } //根据部门id删除用户与部门关系 userDepartMapper.delete(new LambdaQueryWrapper().in(SysUserDepart::getDepId,idList)); //根据部门id删除部门授权 departPermissionMapper.delete(new LambdaQueryWrapper().in(SysDepartPermission::getDepartId,idList)); //根据部门id删除部门角色 - sysDepartRoleMapper.delete(new LambdaQueryWrapper().in(SysDepartRole::getDepartId,idList)); - if(roleIdList != null && roleIdList.size()>0){ - //根据角色id删除部门角色授权 - departRolePermissionMapper.delete(new LambdaQueryWrapper().in(SysDepartRolePermission::getRoleId,roleIdList)); - //根据角色id删除部门角色用户信息 - departRoleUserMapper.delete(new LambdaQueryWrapper().in(SysDepartRoleUser::getDroleId,roleIdList)); - } +// sysDepartRoleMapper.delete(new LambdaQueryWrapper().in(SysDepartRole::getDepartId,idList)); +// if(roleIdList != null && roleIdList.size()>0){ +// 根据角色id删除部门角色授权 +// departRolePermissionMapper.delete(new LambdaQueryWrapper().in(SysDepartRolePermission::getRoleId,roleIdList)); +// 根据角色id删除部门角色用户信息 +// departRoleUserMapper.delete(new LambdaQueryWrapper().in(SysDepartRoleUser::getDroleId,roleIdList)); +// } return ok; } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysPermissionServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysPermissionServiceImpl.java index 042ce05d..fda747cc 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysPermissionServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysPermissionServiceImpl.java @@ -14,7 +14,7 @@ import com.jero.common.util.oConvertUtils; import com.jero.modules.system.entity.SysPermission; import com.jero.modules.system.entity.SysPermissionDataRule; import com.jero.modules.system.mapper.SysDepartPermissionMapper; -import com.jero.modules.system.mapper.SysDepartRolePermissionMapper; +//import com.jero.modules.system.mapper.SysDepartRolePermissionMapper; import com.jero.modules.system.mapper.SysPermissionMapper; import com.jero.modules.system.mapper.SysRolePermissionMapper; import com.jero.modules.system.model.TreeModel; @@ -52,8 +52,8 @@ public class SysPermissionServiceImpl extends ServiceImpl queryListByParentId(String parentId) { @@ -92,7 +92,7 @@ public class SysPermissionServiceImpl extends ServiceImpl().eq(SysPermission::getParentId, id)); // 如果有, 则递归 if (num > 0) { diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java index 3af7dc15..60c6ffd4 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java @@ -56,10 +56,10 @@ public class SysUserServiceImpl extends ServiceImpl impl private SysDepartMapper sysDepartMapper; @Autowired private SysRoleMapper sysRoleMapper; - @Autowired - private SysDepartRoleUserMapper departRoleUserMapper; - @Autowired - private SysDepartRoleMapper sysDepartRoleMapper; +// @Autowired +// private SysDepartRoleUserMapper departRoleUserMapper; +// @Autowired +// private SysDepartRoleMapper sysDepartRoleMapper; @Resource private BaseCommonService baseCommonService; @@ -321,7 +321,7 @@ public class SysUserServiceImpl extends ServiceImpl impl arr = departs.split(","); } //查询已关联部门 - List userDepartList = sysUserDepartMapper.selectList(new QueryWrapper().lambda().eq(SysUserDepart::getUserId, user.getId())); +/* List userDepartList = sysUserDepartMapper.selectList(new QueryWrapper().lambda().eq(SysUserDepart::getUserId, user.getId())); if(userDepartList != null && userDepartList.size()>0){ for(SysUserDepart depart : userDepartList ){ //修改已关联部门删除部门用户角色关系 @@ -335,7 +335,7 @@ public class SysUserServiceImpl extends ServiceImpl impl } } } - } + }*/ //先删后加 sysUserDepartMapper.delete(new QueryWrapper().lambda().eq(SysUserDepart::getUserId, user.getId())); if(oConvertUtils.isNotEmpty(departs)) { @@ -485,7 +485,7 @@ public class SysUserServiceImpl extends ServiceImpl impl arr = departs.split(","); } //查询已关联部门 - List userDepartList = sysUserDepartMapper.selectList(new QueryWrapper().lambda().eq(SysUserDepart::getUserId, user.getId())); + /*List userDepartList = sysUserDepartMapper.selectList(new QueryWrapper().lambda().eq(SysUserDepart::getUserId, user.getId())); if(userDepartList != null && userDepartList.size()>0){ for(SysUserDepart depart : userDepartList ){ //修改已关联部门删除部门用户角色关系 @@ -499,7 +499,7 @@ public class SysUserServiceImpl extends ServiceImpl impl } } } - } + }*/ //先删后加 sysUserDepartMapper.delete(new QueryWrapper().lambda().eq(SysUserDepart::getUserId, user.getId())); if(oConvertUtils.isNotEmpty(departs)) { diff --git a/jero-web/src/api/api.js b/jero-web/src/api/api.js index 5ec91fb7..9cd8bb71 100644 --- a/jero-web/src/api/api.js +++ b/jero-web/src/api/api.js @@ -49,7 +49,7 @@ const queryDepartPermission = (params)=>getAction("/sys/permission/queryDepartPe const saveDepartPermission = (params)=>postAction("/sys/permission/saveDepartPermission",params); const queryTreeListForDeptRole = (params)=>getAction("/sys/sysDepartPermission/queryTreeListForDeptRole",params); const queryDeptRolePermission = (params)=>getAction("/sys/sysDepartPermission/queryDeptRolePermission",params); -const saveDeptRolePermission = (params)=>postAction("/sys/sysDepartPermission/saveDeptRolePermission",params); +// const saveDeptRolePermission = (params)=>postAction("/sys/sysDepartPermission/saveDeptRolePermission",params); const queryMyDepartTreeList = (params)=>getAction("/sys/sysDepart/queryMyDeptTreeList",params); //日志管理 @@ -151,7 +151,7 @@ export { saveDepartPermission, queryTreeListForDeptRole, queryDeptRolePermission, - saveDeptRolePermission, + // saveDeptRolePermission, queryMyDepartTreeList, getUserNoticeInfo, getDictItemsFromCache diff --git a/jero-web/src/views/system/modules/DeptRoleAuthModal.vue b/jero-web/src/views/system/modules/DeptRoleAuthModal.vue index d84845de..8449b8a8 100644 --- a/jero-web/src/views/system/modules/DeptRoleAuthModal.vue +++ b/jero-web/src/views/system/modules/DeptRoleAuthModal.vue @@ -1,213 +1,213 @@ - - - \ No newline at end of file + \ No newline at end of file diff --git a/jero-web/src/views/system/modules/DeptRoleDataruleModal.vue b/jero-web/src/views/system/modules/DeptRoleDataruleModal.vue index f3a12115..01ff78a5 100644 --- a/jero-web/src/views/system/modules/DeptRoleDataruleModal.vue +++ b/jero-web/src/views/system/modules/DeptRoleDataruleModal.vue @@ -1,122 +1,122 @@ - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - \ No newline at end of file + \ No newline at end of file diff --git a/jero-web/src/views/system/modules/SelectUserModal.vue b/jero-web/src/views/system/modules/SelectUserModal.vue index 1ff0239c..9e1d8d55 100644 --- a/jero-web/src/views/system/modules/SelectUserModal.vue +++ b/jero-web/src/views/system/modules/SelectUserModal.vue @@ -17,7 +17,7 @@ - + diff --git a/jero-web/src/views/system/modules/SysDepartRoleModal.vue b/jero-web/src/views/system/modules/SysDepartRoleModal.vue index 2a5ebb18..79d7b4b4 100644 --- a/jero-web/src/views/system/modules/SysDepartRoleModal.vue +++ b/jero-web/src/views/system/modules/SysDepartRoleModal.vue @@ -1,157 +1,157 @@ - + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - \ No newline at end of file + \ No newline at end of file