KH/kh-device-admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

【删除】删除所有和部门角色相关的代码

Browse Source 
【fix】修复部门和角色处用户查询不能模糊匹配用户名的问题
This commit is contained in:
zer0Black
2022-04-17 17:40:14 +08:00
parent 8b72ea3c14
commit c79efc06ed
27 changed files with 1408 additions and 1430 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartPermissionController.java
+41 -41
View File
@@ -13,7 +13,7 @@ import com.jero.common.system.base.controller.JeroController;
import com.jero.common.system.query.QueryGenerator; import com.jero.common.system.query.QueryGenerator;
import com.jero.common.util.oConvertUtils; import com.jero.common.util.oConvertUtils;
import com.jero.modules.system.entity.SysDepartPermission; 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.SysPermission;
import com.jero.modules.system.entity.SysPermissionDataRule; import com.jero.modules.system.entity.SysPermissionDataRule;
import com.jero.modules.system.model.TreeModel; 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.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j; 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.ISysPermissionDataRuleService;
import com.jero.modules.system.service.ISysPermissionService; import com.jero.modules.system.service.ISysPermissionService;
@@ -52,8 +52,8 @@ public class SysDepartPermissionController extends JeroController<SysDepartPermi
@Autowired @Autowired
private ISysPermissionService sysPermissionService; private ISysPermissionService sysPermissionService;
@Autowired // @Autowired
private ISysDepartRolePermissionService sysDepartRolePermissionService; // private ISysDepartRolePermissionService sysDepartRolePermissionService;
/** /**
* 分页列表查询 * 分页列表查询
@@ -192,44 +192,44 @@ public class SysDepartPermissionController extends JeroController<SysDepartPermi
} }
} }
/** // /**
* 查询角色授权 // * 查询角色授权
* // *
* @return // * @return
*/ // */
@RequestMapping(value = "/queryDeptRolePermission", method = RequestMethod.GET) // @RequestMapping(value = "/queryDeptRolePermission", method = RequestMethod.GET)
public Result<List<String>> queryDeptRolePermission(@RequestParam(name = "roleId", required = true) String roleId) { // public Result<List<String>> queryDeptRolePermission(@RequestParam(name = "roleId", required = true) String roleId) {
Result<List<String>> result = new Result<>(); // Result<List<String>> result = new Result<>();
try { // try {
List<SysDepartRolePermission> list = sysDepartRolePermissionService.list(new QueryWrapper<SysDepartRolePermission>().lambda().eq(SysDepartRolePermission::getRoleId, roleId)); // List<SysDepartRolePermission> list = sysDepartRolePermissionService.list(new QueryWrapper<SysDepartRolePermission>().lambda().eq(SysDepartRolePermission::getRoleId, roleId));
result.setResult(list.stream().map(SysDepartRolePermission -> String.valueOf(SysDepartRolePermission.getPermissionId())).collect(Collectors.toList())); // result.setResult(list.stream().map(SysDepartRolePermission -> String.valueOf(SysDepartRolePermission.getPermissionId())).collect(Collectors.toList()));
result.setSuccess(true); // result.setSuccess(true);
} catch (Exception e) { // } catch (Exception e) {
log.error(e.getMessage(), e); // log.error(e.getMessage(), e);
} // }
return result; // return result;
} // }
/** // /**
* 保存角色授权 // * 保存角色授权
* // *
* @return // * @return
*/ // */
@RequestMapping(value = "/saveDeptRolePermission", method = RequestMethod.POST) // @RequestMapping(value = "/saveDeptRolePermission", method = RequestMethod.POST)
public Result<Object> saveDeptRolePermission(@RequestBody JSONObject json) { // public Result<Object> saveDeptRolePermission(@RequestBody JSONObject json) {
long start = System.currentTimeMillis(); // long start = System.currentTimeMillis();
try { // try {
String roleId = json.getString("roleId"); // String roleId = json.getString("roleId");
String permissionIds = json.getString("permissionIds"); // String permissionIds = json.getString("permissionIds");
String lastPermissionIds = json.getString("lastpermissionIds"); // String lastPermissionIds = json.getString("lastpermissionIds");
this.sysDepartRolePermissionService.saveDeptRolePermission(roleId, permissionIds, lastPermissionIds); // this.sysDepartRolePermissionService.saveDeptRolePermission(roleId, permissionIds, lastPermissionIds);
log.info("======部门角色授权成功=====耗时:" + (System.currentTimeMillis() - start) + "毫秒"); // log.info("======部门角色授权成功=====耗时:" + (System.currentTimeMillis() - start) + "毫秒");
return Result.OK("保存成功！"); // return Result.OK("保存成功！");
} catch (Exception e) { // } catch (Exception e) {
log.error(e.getMessage(), e); // log.error(e.getMessage(), e);
return Result.error500("授权失败！"); // return Result.error500("授权失败！");
} // }
} // }
/** /**
* 用户角色授权功能，查询菜单权限树 * 用户角色授权功能，查询菜单权限树
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartRoleController.java
+294 -294
View File
@@ -1,294 +1,294 @@
package com.jero.modules.system.controller; //package com.jero.modules.system.controller;
//
import java.util.*; //import java.util.*;
import java.util.stream.Collectors; //import java.util.stream.Collectors;
import javax.servlet.http.HttpServletRequest; //import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; //import javax.servlet.http.HttpServletResponse;
//
import com.alibaba.fastjson.JSONObject; //import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; //import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.jero.common.system.base.controller.JeroController; //import com.jero.common.system.base.controller.JeroController;
import org.apache.shiro.SecurityUtils; //import org.apache.shiro.SecurityUtils;
import com.jero.common.api.vo.Result; //import com.jero.common.api.vo.Result;
import com.jero.common.system.query.QueryGenerator; //import com.jero.common.system.query.QueryGenerator;
import com.jero.common.aspect.annotation.AutoLog; //import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.system.vo.LoginUser; //import com.jero.common.system.vo.LoginUser;
import com.jero.common.util.oConvertUtils; //import com.jero.common.util.oConvertUtils;
import com.jero.modules.system.entity.*; //import com.jero.modules.system.entity.*;
import com.jero.modules.system.service.*; //import com.jero.modules.system.service.*;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; //import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; //import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; //import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j; //import lombok.extern.slf4j.Slf4j;
//
import org.springframework.beans.factory.annotation.Autowired; //import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; //import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView; //import org.springframework.web.servlet.ModelAndView;
import io.swagger.annotations.Api; //import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; //import io.swagger.annotations.ApiOperation;
//
/** // /**
* @Description: 部门角色 // * @Description: 部门角色
* @Author: jero-boot // * @Author: jero-boot
* @Date: 2020-02-12 // * @Date: 2020-02-12
* @Version: V1.0 // * @Version: V1.0
*/ // */
@Slf4j //@Slf4j
@Api(tags="部门角色") //@Api(tags="部门角色")
@RestController //@RestController
@RequestMapping("/sys/sysDepartRole") //@RequestMapping("/sys/sysDepartRole")
public class SysDepartRoleController extends JeroController<SysDepartRole, ISysDepartRoleService> { //public class SysDepartRoleController extends JeroController<SysDepartRole, ISysDepartRoleService> {
@Autowired // @Autowired
private ISysDepartRoleService sysDepartRoleService; // private ISysDepartRoleService sysDepartRoleService;
//
@Autowired // @Autowired
private ISysDepartRoleUserService departRoleUserService; // private ISysDepartRoleUserService departRoleUserService;
//
@Autowired // @Autowired
private ISysDepartPermissionService sysDepartPermissionService; // private ISysDepartPermissionService sysDepartPermissionService;
//
@Autowired // @Autowired
private ISysDepartRolePermissionService sysDepartRolePermissionService; // private ISysDepartRolePermissionService sysDepartRolePermissionService;
//
@Autowired // @Autowired
private ISysDepartService sysDepartService; // private ISysDepartService sysDepartService;
//
/** // /**
* 分页列表查询 // * 分页列表查询
* // *
* @param sysDepartRole // * @param sysDepartRole
* @param pageNo // * @param pageNo
* @param pageSize // * @param pageSize
* @param req // * @param req
* @return // * @return
*/ // */
@ApiOperation(value="部门角色-分页列表查询", notes="部门角色-分页列表查询") // @ApiOperation(value="部门角色-分页列表查询", notes="部门角色-分页列表查询")
@GetMapping(value = "/page") // @GetMapping(value = "/page")
public Result<?> queryPageList(SysDepartRole sysDepartRole, // public Result<?> queryPageList(SysDepartRole sysDepartRole,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo, // @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize, // @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
@RequestParam(name="deptId",required=false) String deptId, // @RequestParam(name="deptId",required=false) String deptId,
HttpServletRequest req) { // HttpServletRequest req) {
QueryWrapper<SysDepartRole> queryWrapper = QueryGenerator.initQueryWrapper(sysDepartRole, req.getParameterMap()); // QueryWrapper<SysDepartRole> queryWrapper = QueryGenerator.initQueryWrapper(sysDepartRole, req.getParameterMap());
Page<SysDepartRole> page = new Page<SysDepartRole>(pageNo, pageSize); // Page<SysDepartRole> page = new Page<SysDepartRole>(pageNo, pageSize);
LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); // LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
List<String> deptIds = null; // List<String> deptIds = null;
// if(oConvertUtils.isEmpty(deptId)){ //// if(oConvertUtils.isEmpty(deptId)){
// if(oConvertUtils.isNotEmpty(user.getUserIdentity()) && user.getUserIdentity().equals(CommonConstant.USER_IDENTITY_2) ){ //// if(oConvertUtils.isNotEmpty(user.getUserIdentity()) && user.getUserIdentity().equals(CommonConstant.USER_IDENTITY_2) ){
// deptIds = sysDepartService.getMySubDepIdsByDepId(user.getDepartIds()); //// deptIds = sysDepartService.getMySubDepIdsByDepId(user.getDepartIds());
// }else{ //// }else{
// return Result.OK(null); //// return Result.OK(null);
// } //// }
// }else{ //// }else{
// deptIds = sysDepartService.getSubDepIdsByDepId(deptId); //// deptIds = sysDepartService.getSubDepIdsByDepId(deptId);
// } //// }
// queryWrapper.in("depart_id",deptIds); //// queryWrapper.in("depart_id",deptIds);
//
//我的部门，选中部门只能看当前部门下的角色 // //我的部门，选中部门只能看当前部门下的角色
queryWrapper.eq("depart_id",deptId); // queryWrapper.eq("depart_id",deptId);
IPage<SysDepartRole> pageList = sysDepartRoleService.page(page, queryWrapper); // IPage<SysDepartRole> pageList = sysDepartRoleService.page(page, queryWrapper);
return Result.OK(pageList); // return Result.OK(pageList);
} // }
//
/** // /**
* 添加 // * 添加
* // *
* @param sysDepartRole // * @param sysDepartRole
* @return // * @return
*/ // */
//@RequiresRoles({"admin"}) // //@RequiresRoles({"admin"})
@ApiOperation(value="部门角色-添加", notes="部门角色-添加") // @ApiOperation(value="部门角色-添加", notes="部门角色-添加")
@PostMapping(value = "/add") // @PostMapping(value = "/add")
public Result<?> add(@RequestBody SysDepartRole sysDepartRole) { // public Result<?> add(@RequestBody SysDepartRole sysDepartRole) {
sysDepartRoleService.save(sysDepartRole); // sysDepartRoleService.save(sysDepartRole);
return Result.OK("添加成功！"); // return Result.OK("添加成功！");
} // }
//
/** // /**
* 编辑 // * 编辑
* // *
* @param sysDepartRole // * @param sysDepartRole
* @return // * @return
*/ // */
//@RequiresRoles({"admin"}) // //@RequiresRoles({"admin"})
@ApiOperation(value="部门角色-编辑", notes="部门角色-编辑") // @ApiOperation(value="部门角色-编辑", notes="部门角色-编辑")
@PutMapping(value = "/edit") // @PutMapping(value = "/edit")
public Result<?> edit(@RequestBody SysDepartRole sysDepartRole) { // public Result<?> edit(@RequestBody SysDepartRole sysDepartRole) {
sysDepartRoleService.updateById(sysDepartRole); // sysDepartRoleService.updateById(sysDepartRole);
return Result.OK("编辑成功!"); // return Result.OK("编辑成功!");
} // }
//
/** // /**
* 通过id删除 // * 通过id删除
* // *
* @param id // * @param id
* @return // * @return
*/ // */
//@RequiresRoles({"admin"}) // //@RequiresRoles({"admin"})
@AutoLog(value = "部门角色-通过id删除") // @AutoLog(value = "部门角色-通过id删除")
@ApiOperation(value="部门角色-通过id删除", notes="部门角色-通过id删除") // @ApiOperation(value="部门角色-通过id删除", notes="部门角色-通过id删除")
@DeleteMapping(value = "/delete") // @DeleteMapping(value = "/delete")
public Result<?> delete(@RequestParam(name="id",required=true) String id) { // public Result<?> delete(@RequestParam(name="id",required=true) String id) {
sysDepartRoleService.removeById(id); // sysDepartRoleService.removeById(id);
return Result.OK("删除成功!"); // return Result.OK("删除成功!");
} // }
//
/** // /**
* 批量删除 // * 批量删除
* // *
* @param ids // * @param ids
* @return // * @return
*/ // */
//@RequiresRoles({"admin"}) // //@RequiresRoles({"admin"})
@AutoLog(value = "部门角色-批量删除") // @AutoLog(value = "部门角色-批量删除")
@ApiOperation(value="部门角色-批量删除", notes="部门角色-批量删除") // @ApiOperation(value="部门角色-批量删除", notes="部门角色-批量删除")
@DeleteMapping(value = "/deleteBatch") // @DeleteMapping(value = "/deleteBatch")
public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) { // public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
this.sysDepartRoleService.removeByIds(Arrays.asList(ids.split(","))); // this.sysDepartRoleService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功！"); // return Result.OK("批量删除成功！");
} // }
//
/** // /**
* 通过id查询 // * 通过id查询
* // *
* @param id // * @param id
* @return // * @return
*/ // */
@ApiOperation(value="部门角色-通过id查询", notes="部门角色-通过id查询") // @ApiOperation(value="部门角色-通过id查询", notes="部门角色-通过id查询")
@GetMapping(value = "/queryById") // @GetMapping(value = "/queryById")
public Result<?> queryById(@RequestParam(name="id",required=true) String id) { // public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
SysDepartRole sysDepartRole = sysDepartRoleService.getById(id); // SysDepartRole sysDepartRole = sysDepartRoleService.getById(id);
return Result.OK(sysDepartRole); // return Result.OK(sysDepartRole);
} // }
//
/** // /**
* 获取部门下角色 // * 获取部门下角色
* @param departId // * @param departId
* @return // * @return
*/ // */
@RequestMapping(value = "/getDeptRoleList", method = RequestMethod.GET) // @RequestMapping(value = "/getDeptRoleList", method = RequestMethod.GET)
public Result<List<SysDepartRole>> getDeptRoleList(@RequestParam(value = "departId") String departId,@RequestParam(value = "userId") String userId){ // public Result<List<SysDepartRole>> getDeptRoleList(@RequestParam(value = "departId") String departId,@RequestParam(value = "userId") String userId){
Result<List<SysDepartRole>> result = new Result<>(); // Result<List<SysDepartRole>> result = new Result<>();
//查询选中部门的角色 // //查询选中部门的角色
List<SysDepartRole> deptRoleList = sysDepartRoleService.list(new LambdaQueryWrapper<SysDepartRole>().eq(SysDepartRole::getDepartId,departId)); // List<SysDepartRole> deptRoleList = sysDepartRoleService.list(new LambdaQueryWrapper<SysDepartRole>().eq(SysDepartRole::getDepartId,departId));
result.setSuccess(true); // result.setSuccess(true);
result.setResult(deptRoleList); // result.setResult(deptRoleList);
return result; // return result;
} // }
//
/** // /**
* 设置 // * 设置
* @param json // * @param json
* @return // * @return
*/ // */
//@RequiresRoles({"admin"}) // //@RequiresRoles({"admin"})
@RequestMapping(value = "/deptRoleUserAdd", method = RequestMethod.POST) // @RequestMapping(value = "/deptRoleUserAdd", method = RequestMethod.POST)
public Result<?> deptRoleAdd(@RequestBody JSONObject json) { // public Result<?> deptRoleAdd(@RequestBody JSONObject json) {
String newRoleId = json.getString("newRoleId"); // String newRoleId = json.getString("newRoleId");
String oldRoleId = json.getString("oldRoleId"); // String oldRoleId = json.getString("oldRoleId");
String userId = json.getString("userId"); // String userId = json.getString("userId");
departRoleUserService.deptRoleUserAdd(userId,newRoleId,oldRoleId); // departRoleUserService.deptRoleUserAdd(userId,newRoleId,oldRoleId);
return Result.OK("添加成功！"); // return Result.OK("添加成功！");
} // }
//
/** // /**
* 根据用户id获取已设置部门角色 // * 根据用户id获取已设置部门角色
* @param userId // * @param userId
* @return // * @return
*/ // */
@RequestMapping(value = "/getDeptRoleByUserId", method = RequestMethod.GET) // @RequestMapping(value = "/getDeptRoleByUserId", method = RequestMethod.GET)
public Result<List<SysDepartRoleUser>> getDeptRoleByUserId(@RequestParam(value = "userId") String userId,@RequestParam(value = "departId") String departId){ // public Result<List<SysDepartRoleUser>> getDeptRoleByUserId(@RequestParam(value = "userId") String userId,@RequestParam(value = "departId") String departId){
Result<List<SysDepartRoleUser>> result = new Result<>(); // Result<List<SysDepartRoleUser>> result = new Result<>();
//查询部门下角色 // //查询部门下角色
List<SysDepartRole> roleList = sysDepartRoleService.list(new QueryWrapper<SysDepartRole>().eq("depart_id",departId)); // List<SysDepartRole> roleList = sysDepartRoleService.list(new QueryWrapper<SysDepartRole>().eq("depart_id",departId));
List<String> roleIds = roleList.stream().map(SysDepartRole::getId).collect(Collectors.toList()); // List<String> roleIds = roleList.stream().map(SysDepartRole::getId).collect(Collectors.toList());
//根据角色id,用户id查询已授权角色 // //根据角色id,用户id查询已授权角色
List<SysDepartRoleUser> roleUserList = null; // List<SysDepartRoleUser> roleUserList = null;
if(roleIds!=null && roleIds.size()>0){ // if(roleIds!=null && roleIds.size()>0){
roleUserList = departRoleUserService.list(new QueryWrapper<SysDepartRoleUser>().eq("user_id",userId).in("drole_id",roleIds)); // roleUserList = departRoleUserService.list(new QueryWrapper<SysDepartRoleUser>().eq("user_id",userId).in("drole_id",roleIds));
} // }
result.setSuccess(true); // result.setSuccess(true);
result.setResult(roleUserList); // result.setResult(roleUserList);
return result; // return result;
} // }
//
/** // /**
* 查询数据规则数据 // * 查询数据规则数据
*/ // */
@GetMapping(value = "/datarule/{permissionId}/{departId}/{roleId}") // @GetMapping(value = "/datarule/{permissionId}/{departId}/{roleId}")
public Result<?> loadDatarule(@PathVariable("permissionId") String permissionId,@PathVariable("departId") String departId,@PathVariable("roleId") String roleId) { // public Result<?> loadDatarule(@PathVariable("permissionId") String permissionId,@PathVariable("departId") String departId,@PathVariable("roleId") String roleId) {
//查询已授权的部门规则 // //查询已授权的部门规则
List<SysPermissionDataRule> list = sysDepartPermissionService.getPermRuleListByDeptIdAndPermId(departId,permissionId); // List<SysPermissionDataRule> list = sysDepartPermissionService.getPermRuleListByDeptIdAndPermId(departId,permissionId);
if(list==null || list.size()==0) { // if(list==null || list.size()==0) {
return Result.error("未找到权限配置信息"); // return Result.error("未找到权限配置信息");
}else { // }else {
Map<String,Object> map = new HashMap<>(); // Map<String,Object> map = new HashMap<>();
map.put("datarule", list); // map.put("datarule", list);
LambdaQueryWrapper<SysDepartRolePermission> query = new LambdaQueryWrapper<SysDepartRolePermission>() // LambdaQueryWrapper<SysDepartRolePermission> query = new LambdaQueryWrapper<SysDepartRolePermission>()
.eq(SysDepartRolePermission::getPermissionId, permissionId) // .eq(SysDepartRolePermission::getPermissionId, permissionId)
.eq(SysDepartRolePermission::getRoleId,roleId); // .eq(SysDepartRolePermission::getRoleId,roleId);
SysDepartRolePermission sysRolePermission = sysDepartRolePermissionService.getOne(query); // SysDepartRolePermission sysRolePermission = sysDepartRolePermissionService.getOne(query);
if(sysRolePermission==null) { // if(sysRolePermission==null) {
//return Result.error("未找到角色菜单配置信息"); // //return Result.error("未找到角色菜单配置信息");
}else { // }else {
String drChecked = sysRolePermission.getDataRuleIds(); // String drChecked = sysRolePermission.getDataRuleIds();
if(oConvertUtils.isNotEmpty(drChecked)) { // if(oConvertUtils.isNotEmpty(drChecked)) {
map.put("drChecked", drChecked.endsWith(",")?drChecked.substring(0, drChecked.length()-1):drChecked); // map.put("drChecked", drChecked.endsWith(",")?drChecked.substring(0, drChecked.length()-1):drChecked);
} // }
} // }
return Result.OK(map); // return Result.OK(map);
//TODO 以后按钮权限的查询也走这个请求 无非在map中多加两个key // //TODO 以后按钮权限的查询也走这个请求 无非在map中多加两个key
} // }
} // }
//
/** // /**
* 保存数据规则至角色菜单关联表 // * 保存数据规则至角色菜单关联表
*/ // */
@PostMapping(value = "/datarule") // @PostMapping(value = "/datarule")
public Result<?> saveDatarule(@RequestBody JSONObject jsonObject) { // public Result<?> saveDatarule(@RequestBody JSONObject jsonObject) {
try { // try {
String permissionId = jsonObject.getString("permissionId"); // String permissionId = jsonObject.getString("permissionId");
String roleId = jsonObject.getString("roleId"); // String roleId = jsonObject.getString("roleId");
String dataRuleIds = jsonObject.getString("dataRuleIds"); // String dataRuleIds = jsonObject.getString("dataRuleIds");
log.info("保存数据规则>>"+"菜单ID:"+permissionId+"角色ID:"+ roleId+"数据权限ID:"+dataRuleIds); // log.info("保存数据规则>>"+"菜单ID:"+permissionId+"角色ID:"+ roleId+"数据权限ID:"+dataRuleIds);
LambdaQueryWrapper<SysDepartRolePermission> query = new LambdaQueryWrapper<SysDepartRolePermission>() // LambdaQueryWrapper<SysDepartRolePermission> query = new LambdaQueryWrapper<SysDepartRolePermission>()
.eq(SysDepartRolePermission::getPermissionId, permissionId) // .eq(SysDepartRolePermission::getPermissionId, permissionId)
.eq(SysDepartRolePermission::getRoleId,roleId); // .eq(SysDepartRolePermission::getRoleId,roleId);
SysDepartRolePermission sysRolePermission = sysDepartRolePermissionService.getOne(query); // SysDepartRolePermission sysRolePermission = sysDepartRolePermissionService.getOne(query);
if(sysRolePermission==null) { // if(sysRolePermission==null) {
return Result.error("请先保存角色菜单权限!"); // return Result.error("请先保存角色菜单权限!");
}else { // }else {
sysRolePermission.setDataRuleIds(dataRuleIds); // sysRolePermission.setDataRuleIds(dataRuleIds);
this.sysDepartRolePermissionService.updateById(sysRolePermission); // this.sysDepartRolePermissionService.updateById(sysRolePermission);
} // }
} catch (Exception e) { // } catch (Exception e) {
log.error("SysRoleController.saveDatarule()发生异常：" + e.getMessage(),e); // log.error("SysRoleController.saveDatarule()发生异常：" + e.getMessage(),e);
return Result.error("保存失败"); // return Result.error("保存失败");
} // }
return Result.OK("保存成功!"); // return Result.OK("保存成功!");
} // }
//
/** // /**
* 导出excel // * 导出excel
* // *
* @param request // * @param request
* @param sysDepartRole // * @param sysDepartRole
*/ // */
@RequestMapping(value = "/exportXls") // @RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, SysDepartRole sysDepartRole) { // public ModelAndView exportXls(HttpServletRequest request, SysDepartRole sysDepartRole) {
return super.exportXls(request, sysDepartRole, SysDepartRole.class, "部门角色"); // return super.exportXls(request, sysDepartRole, SysDepartRole.class, "部门角色");
} // }
//
/** // /**
* 通过excel导入数据 // * 通过excel导入数据
* // *
* @param request // * @param request
* @param response // * @param response
* @return // * @return
*/ // */
@RequestMapping(value = "/importExcel", method = RequestMethod.POST) // @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) { // public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, SysDepartRole.class); // return super.importExcel(request, response, SysDepartRole.class);
} // }
//
} //}
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java
+20 -20
View File
@@ -82,11 +82,11 @@ public class SysUserController {
@Autowired @Autowired
private ISysUserRoleService userRoleService; private ISysUserRoleService userRoleService;
@Autowired // @Autowired
private ISysDepartRoleUserService departRoleUserService; // private ISysDepartRoleUserService departRoleUserService;
@Autowired // @Autowired
private ISysDepartRoleService departRoleService; // private ISysDepartRoleService departRoleService;
@Autowired @Autowired
private RedisUtil redisUtil; private RedisUtil redisUtil;
@@ -779,19 +779,19 @@ public class SysUserController {
try { try {
QueryWrapper<SysUserDepart> queryWrapper = new QueryWrapper<SysUserDepart>(); QueryWrapper<SysUserDepart> queryWrapper = new QueryWrapper<SysUserDepart>();
queryWrapper.eq("dep_id", depId).eq("user_id",userId); queryWrapper.eq("dep_id", depId).eq("user_id",userId);
boolean b = sysUserDepartService.remove(queryWrapper); sysUserDepartService.remove(queryWrapper);
if(b){ // if(b){
List<SysDepartRole> sysDepartRoleList = departRoleService.list(new QueryWrapper<SysDepartRole>().eq("depart_id",depId)); // List<SysDepartRole> sysDepartRoleList = departRoleService.list(new QueryWrapper<SysDepartRole>().eq("depart_id",depId));
List<String> roleIds = sysDepartRoleList.stream().map(SysDepartRole::getId).collect(Collectors.toList()); // List<String> roleIds = sysDepartRoleList.stream().map(SysDepartRole::getId).collect(Collectors.toList());
if(roleIds != null && roleIds.size()>0){ // if(roleIds != null && roleIds.size()>0){
QueryWrapper<SysDepartRoleUser> query = new QueryWrapper<>(); // QueryWrapper<SysDepartRoleUser> query = new QueryWrapper<>();
query.eq("user_id",userId).in("drole_id",roleIds); // query.eq("user_id",userId).in("drole_id",roleIds);
departRoleUserService.remove(query); // departRoleUserService.remove(query);
} // }
return Result.OK("删除成功!"); return Result.OK("删除成功!");
}else{ // }else{
return Result.error500("当前选中部门与用户无关联关系!"); // return Result.error500("当前选中部门与用户无关联关系!");
} // }
}catch(Exception e) { }catch(Exception e) {
log.error(e.getMessage(), e); log.error(e.getMessage(), e);
return Result.error500("删除失败！"); return Result.error500("删除失败！");
@@ -808,10 +808,10 @@ public class SysUserController {
try { try {
QueryWrapper<SysUserDepart> queryWrapper = new QueryWrapper<SysUserDepart>(); QueryWrapper<SysUserDepart> queryWrapper = new QueryWrapper<SysUserDepart>();
queryWrapper.eq("dep_id", depId).in("user_id",Arrays.asList(userIds.split(","))); queryWrapper.eq("dep_id", depId).in("user_id",Arrays.asList(userIds.split(",")));
boolean b = sysUserDepartService.remove(queryWrapper); sysUserDepartService.remove(queryWrapper);
if(b){ // if(b){
departRoleUserService.removeDeptRoleUser(Arrays.asList(userIds.split(",")),depId); // departRoleUserService.removeDeptRoleUser(Arrays.asList(userIds.split(",")),depId);
} // }
return Result.OK("删除成功!"); return Result.OK("删除成功!");
}catch(Exception e) { }catch(Exception e) {
log.error(e.getMessage(), e); log.error(e.getMessage(), e);
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDepartRole.java
+75 -75
View File
@@ -1,75 +1,75 @@
package com.jero.modules.system.entity; //package com.jero.modules.system.entity;
//
import java.io.Serializable; //import java.io.Serializable;
import java.util.Date; //import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType; //import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId; //import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; //import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableField; //import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModel; //import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; //import io.swagger.annotations.ApiModelProperty;
import lombok.Data; //import lombok.Data;
import lombok.EqualsAndHashCode; //import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; //import lombok.experimental.Accessors;
import com.fasterxml.jackson.annotation.JsonFormat; //import com.fasterxml.jackson.annotation.JsonFormat;
import com.jero.common.aspect.annotation.Dict; //import com.jero.common.aspect.annotation.Dict;
import org.springframework.format.annotation.DateTimeFormat; //import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel; //import org.jeecgframework.poi.excel.annotation.Excel;
//
/** ///**
* @Description: 部门角色 // * @Description: 部门角色
* @Author: jero-boot // * @Author: jero-boot
* @Date: 2020-02-12 // * @Date: 2020-02-12
* @Version: V1.0 // * @Version: V1.0
*/ // */
@Data //@Data
@TableName("sys_depart_role") //@TableName("sys_depart_role")
@EqualsAndHashCode(callSuper = false) //@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true) //@Accessors(chain = true)
@ApiModel(value="sys_depart_role对象", description="部门角色") //@ApiModel(value="sys_depart_role对象", description="部门角色")
public class SysDepartRole { //public class SysDepartRole {
//
/**id*/ // /**id*/
@TableId(type = IdType.ASSIGN_ID) // @TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "id") // @ApiModelProperty(value = "id")
private java.lang.String id; // private java.lang.String id;
/**部门id*/ // /**部门id*/
@Excel(name = "部门id", width = 15) // @Excel(name = "部门id", width = 15)
@ApiModelProperty(value = "部门id") // @ApiModelProperty(value = "部门id")
@Dict(dictTable ="sys_depart",dicText = "depart_name",dicCode = "id") // @Dict(dictTable ="sys_depart",dicText = "depart_name",dicCode = "id")
private java.lang.String departId; // private java.lang.String departId;
/**部门角色名称*/ // /**部门角色名称*/
@Excel(name = "部门角色名称", width = 15) // @Excel(name = "部门角色名称", width = 15)
@ApiModelProperty(value = "部门角色名称") // @ApiModelProperty(value = "部门角色名称")
private java.lang.String roleName; // private java.lang.String roleName;
/**部门角色编码*/ // /**部门角色编码*/
@Excel(name = "部门角色编码", width = 15) // @Excel(name = "部门角色编码", width = 15)
@ApiModelProperty(value = "部门角色编码") // @ApiModelProperty(value = "部门角色编码")
private java.lang.String roleCode; // private java.lang.String roleCode;
/**描述*/ // /**描述*/
@Excel(name = "描述", width = 15) // @Excel(name = "描述", width = 15)
@ApiModelProperty(value = "描述") // @ApiModelProperty(value = "描述")
private java.lang.String description; // private java.lang.String description;
/**创建人*/ // /**创建人*/
@Excel(name = "创建人", width = 15) // @Excel(name = "创建人", width = 15)
@ApiModelProperty(value = "创建人") // @ApiModelProperty(value = "创建人")
private java.lang.String createBy; // private java.lang.String createBy;
/**创建时间*/ // /**创建时间*/
@Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") // @Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8",pattern = "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") // @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "创建时间") // @ApiModelProperty(value = "创建时间")
private java.util.Date createTime; // private java.util.Date createTime;
/**更新人*/ // /**更新人*/
@Excel(name = "更新人", width = 15) // @Excel(name = "更新人", width = 15)
@ApiModelProperty(value = "更新人") // @ApiModelProperty(value = "更新人")
private java.lang.String updateBy; // private java.lang.String updateBy;
/**更新时间*/ // /**更新时间*/
@Excel(name = "更新时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") // @Excel(name = "更新时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8",pattern = "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") // @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "更新时间") // @ApiModelProperty(value = "更新时间")
private java.util.Date updateTime; // private java.util.Date updateTime;
//
//
} //}
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDepartRolePermission.java
+67 -67
View File
@@ -1,67 +1,67 @@
package com.jero.modules.system.entity; //package com.jero.modules.system.entity;
//
import java.io.Serializable; //import java.io.Serializable;
import java.util.Date; //import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType; //import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId; //import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; //import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableField; //import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModel; //import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; //import io.swagger.annotations.ApiModelProperty;
import lombok.Data; //import lombok.Data;
import lombok.EqualsAndHashCode; //import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; //import lombok.experimental.Accessors;
import com.fasterxml.jackson.annotation.JsonFormat; //import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat; //import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel; //import org.jeecgframework.poi.excel.annotation.Excel;
//
/** ///**
* @Description: 部门角色权限 // * @Description: 部门角色权限
* @Author: jero-boot // * @Author: jero-boot
* @Date: 2020-02-12 // * @Date: 2020-02-12
* @Version: V1.0 // * @Version: V1.0
*/ // */
@Data //@Data
@TableName("sys_depart_role_permission") //@TableName("sys_depart_role_permission")
@EqualsAndHashCode(callSuper = false) //@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true) //@Accessors(chain = true)
@ApiModel(value="sys_depart_role_permission对象", description="部门角色权限") //@ApiModel(value="sys_depart_role_permission对象", description="部门角色权限")
public class SysDepartRolePermission { //public class SysDepartRolePermission {
//
/**id*/ // /**id*/
@TableId(type = IdType.ASSIGN_ID) // @TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "id") // @ApiModelProperty(value = "id")
private java.lang.String id; // private java.lang.String id;
/**部门id*/ // /**部门id*/
@Excel(name = "部门id", width = 15) // @Excel(name = "部门id", width = 15)
@ApiModelProperty(value = "部门id") // @ApiModelProperty(value = "部门id")
private java.lang.String departId; // private java.lang.String departId;
/**角色id*/ // /**角色id*/
@Excel(name = "角色id", width = 15) // @Excel(name = "角色id", width = 15)
@ApiModelProperty(value = "角色id") // @ApiModelProperty(value = "角色id")
private java.lang.String roleId; // private java.lang.String roleId;
/**权限id*/ // /**权限id*/
@Excel(name = "权限id", width = 15) // @Excel(name = "权限id", width = 15)
@ApiModelProperty(value = "权限id") // @ApiModelProperty(value = "权限id")
private java.lang.String permissionId; // private java.lang.String permissionId;
/**dataRuleIds*/ // /**dataRuleIds*/
@Excel(name = "dataRuleIds", width = 15) // @Excel(name = "dataRuleIds", width = 15)
@ApiModelProperty(value = "dataRuleIds") // @ApiModelProperty(value = "dataRuleIds")
private java.lang.String dataRuleIds; // private java.lang.String dataRuleIds;
/** 操作时间 */ // /** 操作时间 */
@Excel(name = "操作时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") // @Excel(name = "操作时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8",pattern = "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") // @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "操作时间") // @ApiModelProperty(value = "操作时间")
private java.util.Date operateDate; // private java.util.Date operateDate;
/** 操作ip */ // /** 操作ip */
private java.lang.String operateIp; // private java.lang.String operateIp;
//
public SysDepartRolePermission() { // public SysDepartRolePermission() {
} // }
//
public SysDepartRolePermission(String roleId, String permissionId) { // public SysDepartRolePermission(String roleId, String permissionId) {
this.roleId = roleId; // this.roleId = roleId;
this.permissionId = permissionId; // this.permissionId = permissionId;
} // }
} //}
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDepartRoleUser.java
+52 -52
View File
@@ -1,52 +1,52 @@
package com.jero.modules.system.entity; //package com.jero.modules.system.entity;
//
import java.io.Serializable; //import java.io.Serializable;
import java.util.Date; //import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType; //import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId; //import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; //import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableField; //import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModel; //import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; //import io.swagger.annotations.ApiModelProperty;
import lombok.Data; //import lombok.Data;
import lombok.EqualsAndHashCode; //import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; //import lombok.experimental.Accessors;
import com.fasterxml.jackson.annotation.JsonFormat; //import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat; //import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel; //import org.jeecgframework.poi.excel.annotation.Excel;
//
/** ///**
* @Description: 部门角色人员信息 // * @Description: 部门角色人员信息
* @Author: jero-boot // * @Author: jero-boot
* @Date: 2020-02-13 // * @Date: 2020-02-13
* @Version: V1.0 // * @Version: V1.0
*/ // */
@Data //@Data
@TableName("sys_depart_role_user") //@TableName("sys_depart_role_user")
@EqualsAndHashCode(callSuper = false) //@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true) //@Accessors(chain = true)
@ApiModel(value="sys_depart_role_user对象", description="部门角色人员信息") //@ApiModel(value="sys_depart_role_user对象", description="部门角色人员信息")
public class SysDepartRoleUser { //public class SysDepartRoleUser {
//
/**主键id*/ // /**主键id*/
@TableId(type = IdType.ASSIGN_ID) // @TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "主键id") // @ApiModelProperty(value = "主键id")
private java.lang.String id; // private java.lang.String id;
/**用户id*/ // /**用户id*/
@Excel(name = "用户id", width = 15) // @Excel(name = "用户id", width = 15)
@ApiModelProperty(value = "用户id") // @ApiModelProperty(value = "用户id")
private java.lang.String userId; // private java.lang.String userId;
/**角色id*/ // /**角色id*/
@Excel(name = "角色id", width = 15) // @Excel(name = "角色id", width = 15)
@ApiModelProperty(value = "角色id") // @ApiModelProperty(value = "角色id")
private java.lang.String droleId; // private java.lang.String droleId;
//
public SysDepartRoleUser() { // public SysDepartRoleUser() {
//
} // }
//
public SysDepartRoleUser(String userId, String droleId) { // public SysDepartRoleUser(String userId, String droleId) {
this.userId = userId; // this.userId = userId;
this.droleId = droleId; // this.droleId = droleId;
} // }
} //}
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDepartRoleMapper.java
+23 -23
View File
@@ -1,23 +1,23 @@
package com.jero.modules.system.mapper; //package com.jero.modules.system.mapper;
//
import java.util.List; //import java.util.List;
//
import org.apache.ibatis.annotations.Param; //import org.apache.ibatis.annotations.Param;
import com.jero.modules.system.entity.SysDepartRole; //import com.jero.modules.system.entity.SysDepartRole;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; //import com.baomidou.mybatisplus.core.mapper.BaseMapper;
//
/** ///**
* @Description: 部门角色 // * @Description: 部门角色
* @Author: jero-boot // * @Author: jero-boot
* @Date: 2020-02-12 // * @Date: 2020-02-12
* @Version: V1.0 // * @Version: V1.0
*/ // */
public interface SysDepartRoleMapper extends BaseMapper<SysDepartRole> { //public interface SysDepartRoleMapper extends BaseMapper<SysDepartRole> {
/** // /**
* 根据用户id，部门id查询可授权所有部门角色 // * 根据用户id，部门id查询可授权所有部门角色
* @param orgCode // * @param orgCode
* @param userId // * @param userId
* @return // * @return
*/ // */
public List<SysDepartRole> queryDeptRoleByDeptAndUser(@Param("orgCode") String orgCode, @Param("userId") String userId); // public List<SysDepartRole> queryDeptRoleByDeptAndUser(@Param("orgCode") String orgCode, @Param("userId") String userId);
} //}
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDepartRolePermissionMapper.java
+17 -17
View File
@@ -1,17 +1,17 @@
package com.jero.modules.system.mapper; //package com.jero.modules.system.mapper;
//
import java.util.List; //import java.util.List;
//
import org.apache.ibatis.annotations.Param; //import org.apache.ibatis.annotations.Param;
import com.jero.modules.system.entity.SysDepartRolePermission; //import com.jero.modules.system.entity.SysDepartRolePermission;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; //import com.baomidou.mybatisplus.core.mapper.BaseMapper;
//
/** ///**
* @Description: 部门角色权限 // * @Description: 部门角色权限
* @Author: jero-boot // * @Author: jero-boot
* @Date: 2020-02-12 // * @Date: 2020-02-12
* @Version: V1.0 // * @Version: V1.0
*/ // */
public interface SysDepartRolePermissionMapper extends BaseMapper<SysDepartRolePermission> { //public interface SysDepartRolePermissionMapper extends BaseMapper<SysDepartRolePermission> {
//
} //}
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDepartRoleUserMapper.java
+17 -17
View File
@@ -1,17 +1,17 @@
package com.jero.modules.system.mapper; //package com.jero.modules.system.mapper;
//
import java.util.List; //import java.util.List;
//
import org.apache.ibatis.annotations.Param; //import org.apache.ibatis.annotations.Param;
import com.jero.modules.system.entity.SysDepartRoleUser; //import com.jero.modules.system.entity.SysDepartRoleUser;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; //import com.baomidou.mybatisplus.core.mapper.BaseMapper;
//
/** ///**
* @Description: 部门角色人员信息 // * @Description: 部门角色人员信息
* @Author: jero-boot // * @Author: jero-boot
* @Date: 2020-02-13 // * @Date: 2020-02-13
* @Version: V1.0 // * @Version: V1.0
*/ // */
public interface SysDepartRoleUserMapper extends BaseMapper<SysDepartRoleUser> { //public interface SysDepartRoleUserMapper extends BaseMapper<SysDepartRoleUser> {
//
} //}
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysDepartRoleMapper.xml
-12
View File
@@ -1,12 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jero.modules.system.mapper.SysDepartRoleMapper">
<!--根据用户id，部门id查询可授权所有部门角色 -->
<select id="queryDeptRoleByDeptAndUser" resultType="com.jero.modules.system.entity.SysDepartRole">
SELECT * FROM sys_depart_role WHERE depart_id IN (
SELECT id FROM sys_depart WHERE id IN (SELECT dep_id FROM sys_user_depart WHERE user_id=#{userId})
AND org_code LIKE CONCAT(#{orgCode},'%')
)
</select>
</mapper>
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysDepartRolePermissionMapper.xml
-5
View File
@@ -1,5 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jero.modules.system.mapper.SysDepartRolePermissionMapper">
</mapper>
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysDepartRoleUserMapper.xml
-5
View File
@@ -1,5 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jero.modules.system.mapper.SysDepartRoleUserMapper">
</mapper>
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDepartRolePermissionService.java
+20 -20
View File
@@ -1,20 +1,20 @@
package com.jero.modules.system.service; //package com.jero.modules.system.service;
//
import com.jero.modules.system.entity.SysDepartRolePermission; //import com.jero.modules.system.entity.SysDepartRolePermission;
import com.baomidou.mybatisplus.extension.service.IService; //import com.baomidou.mybatisplus.extension.service.IService;
//
/** ///**
* @Description: 部门角色权限 // * @Description: 部门角色权限
* @Author: jero-boot // * @Author: jero-boot
* @Date: 2020-02-12 // * @Date: 2020-02-12
* @Version: V1.0 // * @Version: V1.0
*/ // */
public interface ISysDepartRolePermissionService extends IService<SysDepartRolePermission> { //public interface ISysDepartRolePermissionService extends IService<SysDepartRolePermission> {
/** // /**
* 保存授权 将上次的权限和这次作比较 差异处理提高效率 // * 保存授权 将上次的权限和这次作比较 差异处理提高效率
* @param roleId // * @param roleId
* @param permissionIds // * @param permissionIds
* @param lastPermissionIds // * @param lastPermissionIds
*/ // */
public void saveDeptRolePermission(String roleId,String permissionIds,String lastPermissionIds); // public void saveDeptRolePermission(String roleId,String permissionIds,String lastPermissionIds);
} //}
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDepartRoleService.java
+24 -24
View File
@@ -1,24 +1,24 @@
package com.jero.modules.system.service; //package com.jero.modules.system.service;
//
import com.jero.modules.system.entity.SysDepartRole; //import com.jero.modules.system.entity.SysDepartRole;
import com.baomidou.mybatisplus.extension.service.IService; //import com.baomidou.mybatisplus.extension.service.IService;
//
import java.util.List; //import java.util.List;
//
/** ///**
* @Description: 部门角色 // * @Description: 部门角色
* @Author: jero-boot // * @Author: jero-boot
* @Date: 2020-02-12 // * @Date: 2020-02-12
* @Version: V1.0 // * @Version: V1.0
*/ // */
public interface ISysDepartRoleService extends IService<SysDepartRole> { //public interface ISysDepartRoleService extends IService<SysDepartRole> {
//
/** // /**
* 根据用户id，部门id查询可授权所有部门角色 // * 根据用户id，部门id查询可授权所有部门角色
* @param orgCode // * @param orgCode
* @param userId // * @param userId
* @return // * @return
*/ // */
List<SysDepartRole> queryDeptRoleByDeptAndUser(String orgCode, String userId); // List<SysDepartRole> queryDeptRoleByDeptAndUser(String orgCode, String userId);
//
} //}
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDepartRoleUserService.java
+24 -24
View File
@@ -1,24 +1,24 @@
package com.jero.modules.system.service; //package com.jero.modules.system.service;
//
import com.jero.modules.system.entity.SysDepartRoleUser; //import com.jero.modules.system.entity.SysDepartRoleUser;
import com.baomidou.mybatisplus.extension.service.IService; //import com.baomidou.mybatisplus.extension.service.IService;
//
import java.util.List; //import java.util.List;
//
/** ///**
* @Description: 部门角色人员信息 // * @Description: 部门角色人员信息
* @Author: jero-boot // * @Author: jero-boot
* @Date: 2020-02-13 // * @Date: 2020-02-13
* @Version: V1.0 // * @Version: V1.0
*/ // */
public interface ISysDepartRoleUserService extends IService<SysDepartRoleUser> { //public interface ISysDepartRoleUserService extends IService<SysDepartRoleUser> {
//
void deptRoleUserAdd(String userId,String newRoleId,String oldRoleId); // void deptRoleUserAdd(String userId,String newRoleId,String oldRoleId);
//
/** // /**
* 取消用户与部门关联，删除关联关系 // * 取消用户与部门关联，删除关联关系
* @param userIds // * @param userIds
* @param depId // * @param depId
*/ // */
void removeDeptRoleUser(List<String> userIds,String depId); // void removeDeptRoleUser(List<String> userIds,String depId);
} //}
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartPermissionServiceImpl.java
+13 -13
View File
@@ -4,12 +4,12 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.jero.common.util.oConvertUtils; import com.jero.common.util.oConvertUtils;
import com.jero.modules.system.entity.SysDepartPermission; import com.jero.modules.system.entity.SysDepartPermission;
import com.jero.modules.system.entity.SysDepartRole; //import com.jero.modules.system.entity.SysDepartRole;
import com.jero.modules.system.entity.SysDepartRolePermission; //import com.jero.modules.system.entity.SysDepartRolePermission;
import com.jero.modules.system.entity.SysPermissionDataRule; import com.jero.modules.system.entity.SysPermissionDataRule;
import com.jero.modules.system.mapper.SysDepartPermissionMapper; import com.jero.modules.system.mapper.SysDepartPermissionMapper;
import com.jero.modules.system.mapper.SysDepartRoleMapper; //import com.jero.modules.system.mapper.SysDepartRoleMapper;
import com.jero.modules.system.mapper.SysDepartRolePermissionMapper; //import com.jero.modules.system.mapper.SysDepartRolePermissionMapper;
import com.jero.modules.system.mapper.SysPermissionDataRuleMapper; import com.jero.modules.system.mapper.SysPermissionDataRuleMapper;
import com.jero.modules.system.service.ISysDepartPermissionService; import com.jero.modules.system.service.ISysDepartPermissionService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@@ -32,11 +32,11 @@ public class SysDepartPermissionServiceImpl extends ServiceImpl<SysDepartPermiss
@Resource @Resource
private SysPermissionDataRuleMapper ruleMapper; private SysPermissionDataRuleMapper ruleMapper;
@Resource // @Resource
private SysDepartRoleMapper sysDepartRoleMapper; // private SysDepartRoleMapper sysDepartRoleMapper;
@Resource // @Resource
private SysDepartRolePermissionMapper departRolePermissionMapper; // private SysDepartRolePermissionMapper departRolePermissionMapper;
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
@@ -57,11 +57,11 @@ public class SysDepartPermissionServiceImpl extends ServiceImpl<SysDepartPermiss
for (String permissionId : delete) { for (String permissionId : delete) {
this.remove(new QueryWrapper<SysDepartPermission>().lambda().eq(SysDepartPermission::getDepartId, departId).eq(SysDepartPermission::getPermissionId, permissionId)); this.remove(new QueryWrapper<SysDepartPermission>().lambda().eq(SysDepartPermission::getDepartId, departId).eq(SysDepartPermission::getPermissionId, permissionId));
//删除部门权限时，删除部门角色中已授权的权限 //删除部门权限时，删除部门角色中已授权的权限
List<SysDepartRole> sysDepartRoleList = sysDepartRoleMapper.selectList(new LambdaQueryWrapper<SysDepartRole>().eq(SysDepartRole::getDepartId,departId)); // List<SysDepartRole> sysDepartRoleList = sysDepartRoleMapper.selectList(new LambdaQueryWrapper<SysDepartRole>().eq(SysDepartRole::getDepartId,departId));
List<String> roleIds = sysDepartRoleList.stream().map(SysDepartRole::getId).collect(Collectors.toList()); // List<String> roleIds = sysDepartRoleList.stream().map(SysDepartRole::getId).collect(Collectors.toList());
if(roleIds != null && roleIds.size()>0){ // if(roleIds != null && roleIds.size()>0){
departRolePermissionMapper.delete(new LambdaQueryWrapper<SysDepartRolePermission>().eq(SysDepartRolePermission::getPermissionId,permissionId)); // departRolePermissionMapper.delete(new LambdaQueryWrapper<SysDepartRolePermission>().eq(SysDepartRolePermission::getPermissionId,permissionId));
} // }
} }
} }
} }
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartRolePermissionServiceImpl.java
+87 -87
View File
@@ -1,87 +1,87 @@
package com.jero.modules.system.service.impl; //package com.jero.modules.system.service.impl;
//
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; //import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.jero.common.util.IPUtils; //import com.jero.common.util.IPUtils;
import com.jero.common.util.SpringContextUtils; //import com.jero.common.util.SpringContextUtils;
import com.jero.common.util.oConvertUtils; //import com.jero.common.util.oConvertUtils;
import com.jero.modules.system.entity.SysDepartRolePermission; //import com.jero.modules.system.entity.SysDepartRolePermission;
import com.jero.modules.system.mapper.SysDepartRolePermissionMapper; //import com.jero.modules.system.mapper.SysDepartRolePermissionMapper;
import com.jero.modules.system.service.ISysDepartRolePermissionService; //import com.jero.modules.system.service.ISysDepartRolePermissionService;
import org.springframework.stereotype.Service; //import org.springframework.stereotype.Service;
//
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; //import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
//
import javax.servlet.http.HttpServletRequest; //import javax.servlet.http.HttpServletRequest;
import java.util.*; //import java.util.*;
//
/** ///**
* @Description: 部门角色权限 // * @Description: 部门角色权限
* @Author: jero-boot // * @Author: jero-boot
* @Date: 2020-02-12 // * @Date: 2020-02-12
* @Version: V1.0 // * @Version: V1.0
*/ // */
@Service //@Service
public class SysDepartRolePermissionServiceImpl extends ServiceImpl<SysDepartRolePermissionMapper, SysDepartRolePermission> implements ISysDepartRolePermissionService { //public class SysDepartRolePermissionServiceImpl extends ServiceImpl<SysDepartRolePermissionMapper, SysDepartRolePermission> implements ISysDepartRolePermissionService {
//
@Override // @Override
public void saveDeptRolePermission(String roleId, String permissionIds, String lastPermissionIds) { // public void saveDeptRolePermission(String roleId, String permissionIds, String lastPermissionIds) {
String ip = ""; // String ip = "";
try { // try {
//获取request // //获取request
HttpServletRequest request = SpringContextUtils.getHttpServletRequest(); // HttpServletRequest request = SpringContextUtils.getHttpServletRequest();
//获取IP地址 // //获取IP地址
ip = IPUtils.getIpAddr(request); // ip = IPUtils.getIpAddr(request);
} catch (Exception e) { // } catch (Exception e) {
ip = "127.0.0.1"; // ip = "127.0.0.1";
} // }
List<String> add = getDiff(lastPermissionIds,permissionIds); // List<String> add = getDiff(lastPermissionIds,permissionIds);
if(add!=null && add.size()>0) { // if(add!=null && add.size()>0) {
List<SysDepartRolePermission> list = new ArrayList<SysDepartRolePermission>(); // List<SysDepartRolePermission> list = new ArrayList<SysDepartRolePermission>();
for (String p : add) { // for (String p : add) {
if(oConvertUtils.isNotEmpty(p)) { // if(oConvertUtils.isNotEmpty(p)) {
SysDepartRolePermission rolepms = new SysDepartRolePermission(roleId, p); // SysDepartRolePermission rolepms = new SysDepartRolePermission(roleId, p);
rolepms.setOperateDate(new Date()); // rolepms.setOperateDate(new Date());
rolepms.setOperateIp(ip); // rolepms.setOperateIp(ip);
list.add(rolepms); // list.add(rolepms);
} // }
} // }
this.saveBatch(list); // this.saveBatch(list);
} // }
//
List<String> delete = getDiff(permissionIds,lastPermissionIds); // List<String> delete = getDiff(permissionIds,lastPermissionIds);
if(delete!=null && delete.size()>0) { // if(delete!=null && delete.size()>0) {
for (String permissionId : delete) { // for (String permissionId : delete) {
this.remove(new QueryWrapper<SysDepartRolePermission>().lambda().eq(SysDepartRolePermission::getRoleId, roleId).eq(SysDepartRolePermission::getPermissionId, permissionId)); // this.remove(new QueryWrapper<SysDepartRolePermission>().lambda().eq(SysDepartRolePermission::getRoleId, roleId).eq(SysDepartRolePermission::getPermissionId, permissionId));
} // }
} // }
} // }
//
/** // /**
* 从diff中找出main中没有的元素 // * 从diff中找出main中没有的元素
* @param main // * @param main
* @param diff // * @param diff
* @return // * @return
*/ // */
private List<String> getDiff(String main, String diff){ // private List<String> getDiff(String main, String diff){
if(oConvertUtils.isEmpty(diff)) { // if(oConvertUtils.isEmpty(diff)) {
return null; // return null;
} // }
if(oConvertUtils.isEmpty(main)) { // if(oConvertUtils.isEmpty(main)) {
return Arrays.asList(diff.split(",")); // return Arrays.asList(diff.split(","));
} // }
//
String[] mainArr = main.split(","); // String[] mainArr = main.split(",");
String[] diffArr = diff.split(","); // String[] diffArr = diff.split(",");
Map<String, Integer> map = new HashMap<>(); // Map<String, Integer> map = new HashMap<>();
for (String string : mainArr) { // for (String string : mainArr) {
map.put(string, 1); // map.put(string, 1);
} // }
List<String> res = new ArrayList<String>(); // List<String> res = new ArrayList<String>();
for (String key : diffArr) { // for (String key : diffArr) {
if(oConvertUtils.isNotEmpty(key) && !map.containsKey(key)) { // if(oConvertUtils.isNotEmpty(key) && !map.containsKey(key)) {
res.add(key); // res.add(key);
} // }
} // }
return res; // return res;
} // }
} //}
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartRoleServiceImpl.java
+25 -25
View File
@@ -1,25 +1,25 @@
package com.jero.modules.system.service.impl; //package com.jero.modules.system.service.impl;
//
import com.jero.modules.system.entity.SysDepartRole; //import com.jero.modules.system.entity.SysDepartRole;
import com.jero.modules.system.mapper.SysDepartRoleMapper; //import com.jero.modules.system.mapper.SysDepartRoleMapper;
import com.jero.modules.system.service.ISysDepartRoleService; //import com.jero.modules.system.service.ISysDepartRoleService;
import org.springframework.stereotype.Service; //import org.springframework.stereotype.Service;
//
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; //import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
//
import java.util.List; //import java.util.List;
//
/** ///**
* @Description: 部门角色 // * @Description: 部门角色
* @Author: jero-boot // * @Author: jero-boot
* @Date: 2020-02-12 // * @Date: 2020-02-12
* @Version: V1.0 // * @Version: V1.0
*/ // */
@Service //@Service
public class SysDepartRoleServiceImpl extends ServiceImpl<SysDepartRoleMapper, SysDepartRole> implements ISysDepartRoleService { //public class SysDepartRoleServiceImpl extends ServiceImpl<SysDepartRoleMapper, SysDepartRole> implements ISysDepartRoleService {
//
@Override // @Override
public List<SysDepartRole> queryDeptRoleByDeptAndUser(String orgCode, String userId) { // public List<SysDepartRole> queryDeptRoleByDeptAndUser(String orgCode, String userId) {
return this.baseMapper.queryDeptRoleByDeptAndUser(orgCode,userId); // return this.baseMapper.queryDeptRoleByDeptAndUser(orgCode,userId);
} // }
} //}
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartRoleUserServiceImpl.java
+93 -93
View File
@@ -1,93 +1,93 @@
package com.jero.modules.system.service.impl; //package com.jero.modules.system.service.impl;
//
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; //import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.jero.common.util.oConvertUtils; //import com.jero.common.util.oConvertUtils;
import com.jero.modules.system.entity.SysDepartRole; //import com.jero.modules.system.entity.SysDepartRole;
import com.jero.modules.system.entity.SysDepartRoleUser; //import com.jero.modules.system.entity.SysDepartRoleUser;
import com.jero.modules.system.mapper.SysDepartRoleMapper; //import com.jero.modules.system.mapper.SysDepartRoleMapper;
import com.jero.modules.system.mapper.SysDepartRoleUserMapper; //import com.jero.modules.system.mapper.SysDepartRoleUserMapper;
import com.jero.modules.system.service.ISysDepartRoleUserService; //import com.jero.modules.system.service.ISysDepartRoleUserService;
import org.springframework.beans.factory.annotation.Autowired; //import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; //import org.springframework.stereotype.Service;
//
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; //import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.transaction.annotation.Transactional; //import org.springframework.transaction.annotation.Transactional;
//
import java.util.*; //import java.util.*;
import java.util.stream.Collectors; //import java.util.stream.Collectors;
//
/** ///**
* @Description: 部门角色人员信息 // * @Description: 部门角色人员信息
* @Author: jero-boot // * @Author: jero-boot
* @Date: 2020-02-13 // * @Date: 2020-02-13
* @Version: V1.0 // * @Version: V1.0
*/ // */
@Service //@Service
public class SysDepartRoleUserServiceImpl extends ServiceImpl<SysDepartRoleUserMapper, SysDepartRoleUser> implements ISysDepartRoleUserService { //public class SysDepartRoleUserServiceImpl extends ServiceImpl<SysDepartRoleUserMapper, SysDepartRoleUser> implements ISysDepartRoleUserService {
@Autowired // @Autowired
private SysDepartRoleMapper sysDepartRoleMapper; // private SysDepartRoleMapper sysDepartRoleMapper;
//
@Override // @Override
public void deptRoleUserAdd(String userId, String newRoleId, String oldRoleId) { // public void deptRoleUserAdd(String userId, String newRoleId, String oldRoleId) {
List<String> add = getDiff(oldRoleId,newRoleId); // List<String> add = getDiff(oldRoleId,newRoleId);
if(add!=null && add.size()>0) { // if(add!=null && add.size()>0) {
List<SysDepartRoleUser> list = new ArrayList<>(); // List<SysDepartRoleUser> list = new ArrayList<>();
for (String roleId : add) { // for (String roleId : add) {
if(oConvertUtils.isNotEmpty(roleId)) { // if(oConvertUtils.isNotEmpty(roleId)) {
SysDepartRoleUser rolepms = new SysDepartRoleUser(userId, roleId); // SysDepartRoleUser rolepms = new SysDepartRoleUser(userId, roleId);
list.add(rolepms); // list.add(rolepms);
} // }
} // }
this.saveBatch(list); // this.saveBatch(list);
} // }
List<String> remove = getDiff(newRoleId,oldRoleId); // List<String> remove = getDiff(newRoleId,oldRoleId);
if(remove!=null && remove.size()>0) { // if(remove!=null && remove.size()>0) {
for (String roleId : remove) { // for (String roleId : remove) {
this.remove(new QueryWrapper<SysDepartRoleUser>().lambda().eq(SysDepartRoleUser::getUserId, userId).eq(SysDepartRoleUser::getDroleId, roleId)); // this.remove(new QueryWrapper<SysDepartRoleUser>().lambda().eq(SysDepartRoleUser::getUserId, userId).eq(SysDepartRoleUser::getDroleId, roleId));
} // }
} // }
} // }
//
@Override // @Override
@Transactional(rollbackFor = Exception.class) // @Transactional(rollbackFor = Exception.class)
public void removeDeptRoleUser(List<String> userIds, String depId) { // public void removeDeptRoleUser(List<String> userIds, String depId) {
for(String userId : userIds){ // for(String userId : userIds){
List<SysDepartRole> sysDepartRoleList = sysDepartRoleMapper.selectList(new QueryWrapper<SysDepartRole>().eq("depart_id",depId)); // List<SysDepartRole> sysDepartRoleList = sysDepartRoleMapper.selectList(new QueryWrapper<SysDepartRole>().eq("depart_id",depId));
List<String> roleIds = sysDepartRoleList.stream().map(SysDepartRole::getId).collect(Collectors.toList()); // List<String> roleIds = sysDepartRoleList.stream().map(SysDepartRole::getId).collect(Collectors.toList());
if(roleIds != null && roleIds.size()>0){ // if(roleIds != null && roleIds.size()>0){
QueryWrapper<SysDepartRoleUser> query = new QueryWrapper<>(); // QueryWrapper<SysDepartRoleUser> query = new QueryWrapper<>();
query.eq("user_id",userId).in("drole_id",roleIds); // query.eq("user_id",userId).in("drole_id",roleIds);
this.remove(query); // this.remove(query);
} // }
} // }
} // }
//
/** // /**
* 从diff中找出main中没有的元素 // * 从diff中找出main中没有的元素
* @param main // * @param main
* @param diff // * @param diff
* @return // * @return
*/ // */
private List<String> getDiff(String main, String diff){ // private List<String> getDiff(String main, String diff){
if(oConvertUtils.isEmpty(diff)) { // if(oConvertUtils.isEmpty(diff)) {
return null; // return null;
} // }
if(oConvertUtils.isEmpty(main)) { // if(oConvertUtils.isEmpty(main)) {
return Arrays.asList(diff.split(",")); // return Arrays.asList(diff.split(","));
} // }
//
String[] mainArr = main.split(","); // String[] mainArr = main.split(",");
String[] diffArr = diff.split(","); // String[] diffArr = diff.split(",");
Map<String, Integer> map = new HashMap<>(); // Map<String, Integer> map = new HashMap<>();
for (String string : mainArr) { // for (String string : mainArr) {
map.put(string, 1); // map.put(string, 1);
} // }
List<String> res = new ArrayList<String>(); // List<String> res = new ArrayList<String>();
for (String key : diffArr) { // for (String key : diffArr) {
if(oConvertUtils.isNotEmpty(key) && !map.containsKey(key)) { // if(oConvertUtils.isNotEmpty(key) && !map.containsKey(key)) {
res.add(key); // res.add(key);
} // }
} // }
return res; // return res;
} // }
} //}
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartServiceImpl.java
+31 -31
View File
@@ -41,14 +41,14 @@ public class SysDepartServiceImpl extends ServiceImpl<SysDepartMapper, SysDepart
@Autowired @Autowired
private SysUserDepartMapper userDepartMapper; private SysUserDepartMapper userDepartMapper;
@Autowired // @Autowired
private SysDepartRoleMapper sysDepartRoleMapper; // private SysDepartRoleMapper sysDepartRoleMapper;
@Autowired @Autowired
private SysDepartPermissionMapper departPermissionMapper; private SysDepartPermissionMapper departPermissionMapper;
@Autowired // @Autowired
private SysDepartRolePermissionMapper departRolePermissionMapper; // private SysDepartRolePermissionMapper departRolePermissionMapper;
@Autowired // @Autowired
private SysDepartRoleUserMapper departRoleUserMapper; // private SysDepartRoleUserMapper departRoleUserMapper;
@Autowired @Autowired
private SysUserMapper sysUserMapper; private SysUserMapper sysUserMapper;
@@ -240,24 +240,24 @@ public class SysDepartServiceImpl extends ServiceImpl<SysDepartMapper, SysDepart
this.removeByIds(idList); this.removeByIds(idList);
//根据部门id获取部门角色id //根据部门id获取部门角色id
List<String> roleIdList = new ArrayList<>(); List<String> roleIdList = new ArrayList<>();
LambdaQueryWrapper<SysDepartRole> query = new LambdaQueryWrapper<>(); // LambdaQueryWrapper<SysDepartRole> query = new LambdaQueryWrapper<>();
query.select(SysDepartRole::getId).in(SysDepartRole::getDepartId, idList); // query.select(SysDepartRole::getId).in(SysDepartRole::getDepartId, idList);
List<SysDepartRole> depRoleList = sysDepartRoleMapper.selectList(query); // List<SysDepartRole> depRoleList = sysDepartRoleMapper.selectList(query);
for(SysDepartRole deptRole : depRoleList){ // for(SysDepartRole deptRole : depRoleList){
roleIdList.add(deptRole.getId()); // roleIdList.add(deptRole.getId());
} // }
//根据部门id删除用户与部门关系 //根据部门id删除用户与部门关系
userDepartMapper.delete(new LambdaQueryWrapper<SysUserDepart>().in(SysUserDepart::getDepId,idList)); userDepartMapper.delete(new LambdaQueryWrapper<SysUserDepart>().in(SysUserDepart::getDepId,idList));
//根据部门id删除部门授权 //根据部门id删除部门授权
departPermissionMapper.delete(new LambdaQueryWrapper<SysDepartPermission>().in(SysDepartPermission::getDepartId,idList)); departPermissionMapper.delete(new LambdaQueryWrapper<SysDepartPermission>().in(SysDepartPermission::getDepartId,idList));
//根据部门id删除部门角色 //根据部门id删除部门角色
sysDepartRoleMapper.delete(new LambdaQueryWrapper<SysDepartRole>().in(SysDepartRole::getDepartId,idList)); // sysDepartRoleMapper.delete(new LambdaQueryWrapper<SysDepartRole>().in(SysDepartRole::getDepartId,idList));
if(roleIdList != null && roleIdList.size()>0){ // if(roleIdList != null && roleIdList.size()>0){
//根据角色id删除部门角色授权 //根据角色id删除部门角色授权
departRolePermissionMapper.delete(new LambdaQueryWrapper<SysDepartRolePermission>().in(SysDepartRolePermission::getRoleId,roleIdList)); // departRolePermissionMapper.delete(new LambdaQueryWrapper<SysDepartRolePermission>().in(SysDepartRolePermission::getRoleId,roleIdList));
//根据角色id删除部门角色用户信息 //根据角色id删除部门角色用户信息
departRoleUserMapper.delete(new LambdaQueryWrapper<SysDepartRoleUser>().in(SysDepartRoleUser::getDroleId,roleIdList)); // departRoleUserMapper.delete(new LambdaQueryWrapper<SysDepartRoleUser>().in(SysDepartRoleUser::getDroleId,roleIdList));
} // }
} }
@Override @Override
@@ -329,25 +329,25 @@ public class SysDepartServiceImpl extends ServiceImpl<SysDepartMapper, SysDepart
//FindsDepartsChildrenUtil.clearDepartIdModel(); //FindsDepartsChildrenUtil.clearDepartIdModel();
boolean ok = this.removeByIds(idList); boolean ok = this.removeByIds(idList);
//根据部门id获取部门角色id //根据部门id获取部门角色id
List<String> roleIdList = new ArrayList<>(); // List<String> roleIdList = new ArrayList<>();
LambdaQueryWrapper<SysDepartRole> query = new LambdaQueryWrapper<>(); // LambdaQueryWrapper<SysDepartRole> query = new LambdaQueryWrapper<>();
query.select(SysDepartRole::getId).in(SysDepartRole::getDepartId, idList); // query.select(SysDepartRole::getId).in(SysDepartRole::getDepartId, idList);
List<SysDepartRole> depRoleList = sysDepartRoleMapper.selectList(query); // List<SysDepartRole> depRoleList = sysDepartRoleMapper.selectList(query);
for(SysDepartRole deptRole : depRoleList){ // for(SysDepartRole deptRole : depRoleList){
roleIdList.add(deptRole.getId()); // roleIdList.add(deptRole.getId());
} // }
//根据部门id删除用户与部门关系 //根据部门id删除用户与部门关系
userDepartMapper.delete(new LambdaQueryWrapper<SysUserDepart>().in(SysUserDepart::getDepId,idList)); userDepartMapper.delete(new LambdaQueryWrapper<SysUserDepart>().in(SysUserDepart::getDepId,idList));
//根据部门id删除部门授权 //根据部门id删除部门授权
departPermissionMapper.delete(new LambdaQueryWrapper<SysDepartPermission>().in(SysDepartPermission::getDepartId,idList)); departPermissionMapper.delete(new LambdaQueryWrapper<SysDepartPermission>().in(SysDepartPermission::getDepartId,idList));
//根据部门id删除部门角色 //根据部门id删除部门角色
sysDepartRoleMapper.delete(new LambdaQueryWrapper<SysDepartRole>().in(SysDepartRole::getDepartId,idList)); // sysDepartRoleMapper.delete(new LambdaQueryWrapper<SysDepartRole>().in(SysDepartRole::getDepartId,idList));
if(roleIdList != null && roleIdList.size()>0){ // if(roleIdList != null && roleIdList.size()>0){
//根据角色id删除部门角色授权 // 根据角色id删除部门角色授权
departRolePermissionMapper.delete(new LambdaQueryWrapper<SysDepartRolePermission>().in(SysDepartRolePermission::getRoleId,roleIdList)); // departRolePermissionMapper.delete(new LambdaQueryWrapper<SysDepartRolePermission>().in(SysDepartRolePermission::getRoleId,roleIdList));
//根据角色id删除部门角色用户信息 // 根据角色id删除部门角色用户信息
departRoleUserMapper.delete(new LambdaQueryWrapper<SysDepartRoleUser>().in(SysDepartRoleUser::getDroleId,roleIdList)); // departRoleUserMapper.delete(new LambdaQueryWrapper<SysDepartRoleUser>().in(SysDepartRoleUser::getDroleId,roleIdList));
} // }
return ok; return ok;
} }
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysPermissionServiceImpl.java
+5 -5
View File
@@ -14,7 +14,7 @@ import com.jero.common.util.oConvertUtils;
import com.jero.modules.system.entity.SysPermission; import com.jero.modules.system.entity.SysPermission;
import com.jero.modules.system.entity.SysPermissionDataRule; import com.jero.modules.system.entity.SysPermissionDataRule;
import com.jero.modules.system.mapper.SysDepartPermissionMapper; 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.SysPermissionMapper;
import com.jero.modules.system.mapper.SysRolePermissionMapper; import com.jero.modules.system.mapper.SysRolePermissionMapper;
import com.jero.modules.system.model.TreeModel; import com.jero.modules.system.model.TreeModel;
@@ -52,8 +52,8 @@ public class SysPermissionServiceImpl extends ServiceImpl<SysPermissionMapper, S
@Resource @Resource
private SysDepartPermissionMapper sysDepartPermissionMapper; private SysDepartPermissionMapper sysDepartPermissionMapper;
@Resource // @Resource
private SysDepartRolePermissionMapper sysDepartRolePermissionMapper; // private SysDepartRolePermissionMapper sysDepartRolePermissionMapper;
@Override @Override
public List<TreeModel> queryListByParentId(String parentId) { public List<TreeModel> queryListByParentId(String parentId) {
@@ -92,7 +92,7 @@ public class SysPermissionServiceImpl extends ServiceImpl<SysPermissionMapper, S
//删除部门权限表 //删除部门权限表
sysDepartPermissionMapper.deleteByMap(map); sysDepartPermissionMapper.deleteByMap(map);
//删除部门角色授权 //删除部门角色授权
sysDepartRolePermissionMapper.deleteByMap(map); // sysDepartRolePermissionMapper.deleteByMap(map);
} }
/** /**
@@ -123,7 +123,7 @@ public class SysPermissionServiceImpl extends ServiceImpl<SysPermissionMapper, S
//删除部门权限表 //删除部门权限表
sysDepartPermissionMapper.deleteByMap(map); sysDepartPermissionMapper.deleteByMap(map);
//删除部门角色授权 //删除部门角色授权
sysDepartRolePermissionMapper.deleteByMap(map); // sysDepartRolePermissionMapper.deleteByMap(map);
num = this.count(new LambdaQueryWrapper<SysPermission>().eq(SysPermission::getParentId, id)); num = this.count(new LambdaQueryWrapper<SysPermission>().eq(SysPermission::getParentId, id));
// 如果有, 则递归 // 如果有, 则递归
if (num > 0) { if (num > 0) {
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java
+8 -8
View File
@@ -56,10 +56,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
private SysDepartMapper sysDepartMapper; private SysDepartMapper sysDepartMapper;
@Autowired @Autowired
private SysRoleMapper sysRoleMapper; private SysRoleMapper sysRoleMapper;
@Autowired // @Autowired
private SysDepartRoleUserMapper departRoleUserMapper; // private SysDepartRoleUserMapper departRoleUserMapper;
@Autowired // @Autowired
private SysDepartRoleMapper sysDepartRoleMapper; // private SysDepartRoleMapper sysDepartRoleMapper;
@Resource @Resource
private BaseCommonService baseCommonService; private BaseCommonService baseCommonService;
@@ -321,7 +321,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
arr = departs.split(","); arr = departs.split(",");
} }
//查询已关联部门 //查询已关联部门
List<SysUserDepart> userDepartList = sysUserDepartMapper.selectList(new QueryWrapper<SysUserDepart>().lambda().eq(SysUserDepart::getUserId, user.getId())); /* List<SysUserDepart> userDepartList = sysUserDepartMapper.selectList(new QueryWrapper<SysUserDepart>().lambda().eq(SysUserDepart::getUserId, user.getId()));
if(userDepartList != null && userDepartList.size()>0){ if(userDepartList != null && userDepartList.size()>0){
for(SysUserDepart depart : userDepartList ){ for(SysUserDepart depart : userDepartList ){
//修改已关联部门删除部门用户角色关系 //修改已关联部门删除部门用户角色关系
@@ -335,7 +335,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
} }
} }
} }
} }*/
//先删后加 //先删后加
sysUserDepartMapper.delete(new QueryWrapper<SysUserDepart>().lambda().eq(SysUserDepart::getUserId, user.getId())); sysUserDepartMapper.delete(new QueryWrapper<SysUserDepart>().lambda().eq(SysUserDepart::getUserId, user.getId()));
if(oConvertUtils.isNotEmpty(departs)) { if(oConvertUtils.isNotEmpty(departs)) {
@@ -485,7 +485,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
arr = departs.split(","); arr = departs.split(",");
} }
//查询已关联部门 //查询已关联部门
List<SysUserDepart> userDepartList = sysUserDepartMapper.selectList(new QueryWrapper<SysUserDepart>().lambda().eq(SysUserDepart::getUserId, user.getId())); /*List<SysUserDepart> userDepartList = sysUserDepartMapper.selectList(new QueryWrapper<SysUserDepart>().lambda().eq(SysUserDepart::getUserId, user.getId()));
if(userDepartList != null && userDepartList.size()>0){ if(userDepartList != null && userDepartList.size()>0){
for(SysUserDepart depart : userDepartList ){ for(SysUserDepart depart : userDepartList ){
//修改已关联部门删除部门用户角色关系 //修改已关联部门删除部门用户角色关系
@@ -499,7 +499,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
} }
} }
} }
} }*/
//先删后加 //先删后加
sysUserDepartMapper.delete(new QueryWrapper<SysUserDepart>().lambda().eq(SysUserDepart::getUserId, user.getId())); sysUserDepartMapper.delete(new QueryWrapper<SysUserDepart>().lambda().eq(SysUserDepart::getUserId, user.getId()));
if(oConvertUtils.isNotEmpty(departs)) { if(oConvertUtils.isNotEmpty(departs)) {
jero-web/src/api/api.js
+2 -2
View File
@@ -49,7 +49,7 @@ const queryDepartPermission = (params)=>getAction("/sys/permission/queryDepartPe
const saveDepartPermission = (params)=>postAction("/sys/permission/saveDepartPermission",params); const saveDepartPermission = (params)=>postAction("/sys/permission/saveDepartPermission",params);
const queryTreeListForDeptRole = (params)=>getAction("/sys/sysDepartPermission/queryTreeListForDeptRole",params); const queryTreeListForDeptRole = (params)=>getAction("/sys/sysDepartPermission/queryTreeListForDeptRole",params);
const queryDeptRolePermission = (params)=>getAction("/sys/sysDepartPermission/queryDeptRolePermission",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); const queryMyDepartTreeList = (params)=>getAction("/sys/sysDepart/queryMyDeptTreeList",params);
//日志管理 //日志管理
@@ -151,7 +151,7 @@ export {
saveDepartPermission, saveDepartPermission,
queryTreeListForDeptRole, queryTreeListForDeptRole,
queryDeptRolePermission, queryDeptRolePermission,
saveDeptRolePermission, // saveDeptRolePermission,
queryMyDepartTreeList, queryMyDepartTreeList,
getUserNoticeInfo, getUserNoticeInfo,
getDictItemsFromCache getDictItemsFromCache
jero-web/src/views/system/modules/DeptRoleAuthModal.vue
+206 -206
View File
@@ -1,213 +1,213 @@
<template> <!--<template>-->
<a-drawer <!-- <a-drawer-->
:title="title" <!-- :title="title"-->
:maskClosable="true" <!-- :maskClosable="true"-->
width=650 <!-- width=650-->
placement="right" <!-- placement="right"-->
:closable="true" <!-- :closable="true"-->
@close="close" <!-- @close="close"-->
:visible="visible" <!-- :visible="visible"-->
style="overflow: auto;padding-bottom: 53px;"> <!-- style="overflow: auto;padding-bottom: 53px;">-->
<a-form> <!-- <a-form>-->
<a-form-item label='所拥有的部门权限'> <!-- <a-form-item label='所拥有的部门权限'>-->
<a-tree <!-- <a-tree-->
v-if="treeData.length>0" <!-- v-if="treeData.length>0"-->
checkable <!-- checkable-->
@check="onCheck" <!-- @check="onCheck"-->
:checkedKeys="checkedKeys" <!-- :checkedKeys="checkedKeys"-->
:treeData="treeData" <!-- :treeData="treeData"-->
@expand="onExpand" <!-- @expand="onExpand"-->
@select="onTreeNodeSelect" <!-- @select="onTreeNodeSelect"-->
:selectedKeys="selectedKeys" <!-- :selectedKeys="selectedKeys"-->
:expandedKeys="expandedKeysss" <!-- :expandedKeys="expandedKeysss"-->
:checkStrictly="checkStrictly"> <!-- :checkStrictly="checkStrictly">-->
<span slot="hasDatarule" slot-scope="{slotTitle,ruleFlag}"> <!-- <span slot="hasDatarule" slot-scope="{slotTitle,ruleFlag}">-->
{{ slotTitle }}<a-icon v-if="ruleFlag" type="align-left" style="margin-left:5px;color: red;"></a-icon> <!-- {{ slotTitle }}<a-icon v-if="ruleFlag" type="align-left" style="margin-left:5px;color: red;"></a-icon>-->
</span> <!-- </span>-->
</a-tree> <!-- </a-tree>-->
<div v-else><h3>无可配置部门权限!</h3></div> <!-- <div v-else><h3>无可配置部门权限!</h3></div>-->
</a-form-item> <!-- </a-form-item>-->
</a-form> <!-- </a-form>-->
<div class="drawer-bootom-button"> <!-- <div class="drawer-bootom-button">-->
<a-dropdown style="float: left" :trigger="['click']" placement="topCenter"> <!-- <a-dropdown style="float: left" :trigger="['click']" placement="topCenter">-->
<a-menu slot="overlay"> <!-- <a-menu slot="overlay">-->
<a-menu-item key="1" @click="switchCheckStrictly(1)">父子关联</a-menu-item> <!-- <a-menu-item key="1" @click="switchCheckStrictly(1)">父子关联</a-menu-item>-->
<a-menu-item key="2" @click="switchCheckStrictly(2)">取消关联</a-menu-item> <!-- <a-menu-item key="2" @click="switchCheckStrictly(2)">取消关联</a-menu-item>-->
<a-menu-item key="3" @click="checkALL">全部勾选</a-menu-item> <!-- <a-menu-item key="3" @click="checkALL">全部勾选</a-menu-item>-->
<a-menu-item key="4" @click="cancelCheckALL">取消全选</a-menu-item> <!-- <a-menu-item key="4" @click="cancelCheckALL">取消全选</a-menu-item>-->
<a-menu-item key="5" @click="expandAll">展开所有</a-menu-item> <!-- <a-menu-item key="5" @click="expandAll">展开所有</a-menu-item>-->
<a-menu-item key="6" @click="closeAll">合并所有</a-menu-item> <!-- <a-menu-item key="6" @click="closeAll">合并所有</a-menu-item>-->
</a-menu> <!-- </a-menu>-->
<a-button> <!-- <a-button>-->
树操作 <a-icon type="up" /> <!-- 树操作 <a-icon type="up" />-->
</a-button> <!-- </a-button>-->
</a-dropdown> <!-- </a-dropdown>-->
<a-popconfirm title="确定放弃编辑？" @confirm="close" okText="确定" cancelText="取消"> <!-- <a-popconfirm title="确定放弃编辑？" @confirm="close" okText="确定" cancelText="取消">-->
<a-button style="margin-right: .8rem">取消</a-button> <!-- <a-button style="margin-right: .8rem">取消</a-button>-->
</a-popconfirm> <!-- </a-popconfirm>-->
<a-button @click="handleSubmit(false)" type="primary" :loading="loading" ghost style="margin-right: 0.8rem">仅保存</a-button> <!-- <a-button @click="handleSubmit(false)" type="primary" :loading="loading" ghost style="margin-right: 0.8rem">仅保存</a-button>-->
<a-button @click="handleSubmit(true)" type="primary" :loading="loading">保存并关闭</a-button> <!-- <a-button @click="handleSubmit(true)" type="primary" :loading="loading">保存并关闭</a-button>-->
</div> <!-- </div>-->
<dept-role-datarule-modal ref="datarule"></dept-role-datarule-modal> <!--&lt;!&ndash; <dept-role-datarule-modal ref="datarule"></dept-role-datarule-modal>&ndash;&gt;-->
</a-drawer> <!-- </a-drawer>-->
</template> <!--</template>-->
<script> <!--<script>-->
import {queryTreeListForDeptRole,queryDeptRolePermission,saveDeptRolePermission} from '@/api/api' <!-- import {queryTreeListForDeptRole,queryDeptRolePermission,saveDeptRolePermission} from '@/api/api'-->
import RoleDataruleModal from './RoleDataruleModal.vue' <!-- import RoleDataruleModal from './RoleDataruleModal.vue'-->
import DeptRoleDataruleModal from './DeptRoleDataruleModal' <!-- // import DeptRoleDataruleModal from './DeptRoleDataruleModal'-->
export default { <!-- export default {-->
name: "DeptRoleAuthModal", <!-- name: "DeptRoleAuthModal",-->
components:{ <!-- components:{-->
DeptRoleDataruleModal, <!-- // DeptRoleDataruleModal,-->
RoleDataruleModal <!-- RoleDataruleModal-->
}, <!-- },-->
data(){ <!-- data(){-->
return { <!-- return {-->
departId:"", <!-- departId:"",-->
roleId:"", <!-- roleId:"",-->
treeData: [], <!-- treeData: [],-->
defaultCheckedKeys:[], <!-- defaultCheckedKeys:[],-->
checkedKeys:[], <!-- checkedKeys:[],-->
halfCheckedKeys:[], <!-- halfCheckedKeys:[],-->
expandedKeysss:[], <!-- expandedKeysss:[],-->
allTreeKeys:[], <!-- allTreeKeys:[],-->
autoExpandParent: true, <!-- autoExpandParent: true,-->
checkStrictly: true, <!-- checkStrictly: true,-->
title:"部门角色权限配置", <!-- title:"部门角色权限配置",-->
visible: false, <!-- visible: false,-->
loading: false, <!-- loading: false,-->
selectedKeys:[] <!-- selectedKeys:[]-->
} <!-- }-->
}, <!-- },-->
methods: { <!-- methods: {-->
switchCheckStrictly (v) { <!-- switchCheckStrictly (v) {-->
if(v==1){ <!-- if(v==1){-->
this.checkStrictly = false <!-- this.checkStrictly = false-->
}else if(v==2){ <!-- }else if(v==2){-->
this.checkStrictly = true <!-- this.checkStrictly = true-->
} <!-- }-->
}, <!-- },-->
onTreeNodeSelect(id){ <!-- onTreeNodeSelect(id){-->
if(id && id.length>0){ <!-- if(id && id.length>0){-->
this.selectedKeys = id <!-- this.selectedKeys = id-->
} <!-- }-->
this.$refs.datarule.show(this.selectedKeys[0],this.departId,this.roleId) <!-- this.$refs.datarule.show(this.selectedKeys[0],this.departId,this.roleId)-->
}, <!-- },-->
onCheck (o) { <!-- onCheck (o) {-->
if(this.checkStrictly){ <!-- if(this.checkStrictly){-->
this.checkedKeys = o.checked; <!-- this.checkedKeys = o.checked;-->
}else{ <!-- }else{-->
this.checkedKeys = o <!-- this.checkedKeys = o-->
} <!-- }-->
}, <!-- },-->
show(roleId,departId){ <!-- show(roleId,departId){-->
this.departId = departId <!-- this.departId = departId-->
this.roleId=roleId <!-- this.roleId=roleId-->
this.visible = true; <!-- this.visible = true;-->
}, <!-- },-->
close () { <!-- close () {-->
this.reset() <!-- this.reset()-->
this.$emit('close'); <!-- this.$emit('close');-->
this.visible = false; <!-- this.visible = false;-->
}, <!-- },-->
onExpand(expandedKeys){ <!-- onExpand(expandedKeys){-->
this.expandedKeysss = expandedKeys; <!-- this.expandedKeysss = expandedKeys;-->
this.autoExpandParent = false <!-- this.autoExpandParent = false-->
}, <!-- },-->
reset () { <!-- reset () {-->
this.expandedKeysss = [] <!-- this.expandedKeysss = []-->
this.checkedKeys = [] <!-- this.checkedKeys = []-->
this.defaultCheckedKeys = [] <!-- this.defaultCheckedKeys = []-->
this.loading = false <!-- this.loading = false-->
}, <!-- },-->
expandAll () { <!-- expandAll () {-->
this.expandedKeysss = this.allTreeKeys <!-- this.expandedKeysss = this.allTreeKeys-->
}, <!-- },-->
closeAll () { <!-- closeAll () {-->
this.expandedKeysss = [] <!-- this.expandedKeysss = []-->
}, <!-- },-->
checkALL () { <!-- checkALL () {-->
this.checkedKeys = this.allTreeKeys <!-- this.checkedKeys = this.allTreeKeys-->
}, <!-- },-->
cancelCheckALL () { <!-- cancelCheckALL () {-->
this.checkedKeys = [] <!-- this.checkedKeys = []-->
}, <!-- },-->
handleCancel () { <!-- handleCancel () {-->
this.close() <!-- this.close()-->
}, <!-- },-->
handleSubmit(exit) { <!-- handleSubmit(exit) {-->
let that = this; <!-- let that = this;-->
let params = { <!-- let params = {-->
roleId:that.roleId, <!-- roleId:that.roleId,-->
permissionIds:that.checkedKeys.join(","), <!-- permissionIds:that.checkedKeys.join(","),-->
lastpermissionIds:that.defaultCheckedKeys.join(","), <!-- lastpermissionIds:that.defaultCheckedKeys.join(","),-->
}; <!-- };-->
that.loading = true; <!-- that.loading = true;-->
console.log("请求参数：",params); <!-- console.log("请求参数：",params);-->
saveDeptRolePermission(params).then((res)=>{ <!-- saveDeptRolePermission(params).then((res)=>{-->
if(res.success){ <!-- if(res.success){-->
that.$message.success(res.message); <!-- that.$message.success(res.message);-->
that.loading = false; <!-- that.loading = false;-->
if (exit) { <!-- if (exit) {-->
that.close() <!-- that.close()-->
} <!-- }-->
}else { <!-- }else {-->
that.$message.error(res.message); <!-- that.$message.error(res.message);-->
that.loading = false; <!-- that.loading = false;-->
if (exit) { <!-- if (exit) {-->
that.close() <!-- that.close()-->
} <!-- }-->
} <!-- }-->
this.loadData(); <!-- this.loadData();-->
}) <!-- })-->
}, <!-- },-->
convertTreeListToKeyLeafPairs(treeList, keyLeafPair = []) { <!-- convertTreeListToKeyLeafPairs(treeList, keyLeafPair = []) {-->
for(const {key, isLeaf, children} of treeList) { <!-- for(const {key, isLeaf, children} of treeList) {-->
keyLeafPair.push({key, isLeaf}) <!-- keyLeafPair.push({key, isLeaf})-->
if(children && children.length > 0) { <!-- if(children && children.length > 0) {-->
this.convertTreeListToKeyLeafPairs(children, keyLeafPair) <!-- this.convertTreeListToKeyLeafPairs(children, keyLeafPair)-->
} <!-- }-->
} <!-- }-->
return keyLeafPair; <!-- return keyLeafPair;-->
}, <!-- },-->
loadData(){ <!-- loadData(){-->
queryTreeListForDeptRole({departId:this.departId}).then((res) => { <!-- queryTreeListForDeptRole({departId:this.departId}).then((res) => {-->
this.treeData = res.result.treeList <!-- this.treeData = res.result.treeList-->
this.allTreeKeys = res.result.ids <!-- this.allTreeKeys = res.result.ids-->
queryDeptRolePermission({roleId:this.roleId}).then((res)=>{ <!-- queryDeptRolePermission({roleId:this.roleId}).then((res)=>{-->
this.checkedKeys = [...res.result]; <!-- this.checkedKeys = [...res.result];-->
this.defaultCheckedKeys = [...res.result]; <!-- this.defaultCheckedKeys = [...res.result];-->
this.expandedKeysss = this.allTreeKeys; <!-- this.expandedKeysss = this.allTreeKeys;-->
}) <!-- })-->
}) <!-- })-->
} <!-- }-->
}, <!-- },-->
watch: { <!-- watch: {-->
visible () { <!-- visible () {-->
if (this.visible ) { <!-- if (this.visible ) {-->
this.loadData(); <!-- this.loadData();-->
} <!-- }-->
} <!-- }-->
} <!-- }-->
} <!-- }-->
</script> <!--</script>-->
<style lang="less" scoped> <!--<style lang="less" scoped>-->
.drawer-bootom-button { <!-- .drawer-bootom-button {-->
position: absolute; <!-- position: absolute;-->
bottom: 0; <!-- bottom: 0;-->
width: 100%; <!-- width: 100%;-->
border-top: 1px solid #e8e8e8; <!-- border-top: 1px solid #e8e8e8;-->
padding: 10px 16px; <!-- padding: 10px 16px;-->
text-align: right; <!-- text-align: right;-->
left: 0; <!-- left: 0;-->
background: #fff; <!-- background: #fff;-->
border-radius: 0 0 2px 2px; <!-- border-radius: 0 0 2px 2px;-->
} <!-- }-->
</style> <!--</style>-->
jero-web/src/views/system/modules/DeptRoleDataruleModal.vue
+113 -113
View File
@@ -1,122 +1,122 @@
<template> <!--<template>-->
<a-drawer <!-- <a-drawer-->
title="数据规则/按钮权限配置" <!-- title="数据规则/按钮权限配置"-->
width="365" <!-- width="365"-->
:closable="false" <!-- :closable="false"-->
@close="onClose" <!-- @close="onClose"-->
:visible="visible" <!-- :visible="visible"-->
> <!-- >-->
<a-tabs defaultActiveKey="1"> <!-- <a-tabs defaultActiveKey="1">-->
<a-tab-pane tab="数据规则" key="1"> <!-- <a-tab-pane tab="数据规则" key="1">-->
<a-checkbox-group v-model="dataruleChecked" v-if="dataruleList.length>0"> <!-- <a-checkbox-group v-model="dataruleChecked" v-if="dataruleList.length>0">-->
<a-row> <!-- <a-row>-->
<a-col :span="24" v-for="(item,index) in dataruleList" :key=" 'dr'+index "> <!-- <a-col :span="24" v-for="(item,index) in dataruleList" :key=" 'dr'+index ">-->
<a-checkbox :value="item.id">{{ item.ruleName }}</a-checkbox> <!-- <a-checkbox :value="item.id">{{ item.ruleName }}</a-checkbox>-->
</a-col> <!-- </a-col>-->
<a-col :span="24"> <!-- <a-col :span="24">-->
<div style="width: 100%;margin-top: 15px"> <!-- <div style="width: 100%;margin-top: 15px">-->
<a-button @click="saveDataruleForRole" type="primary" size="small" icon="save">点击保存</a-button> <!-- <a-button @click="saveDataruleForRole" type="primary" size="small" icon="save">点击保存</a-button>-->
</div> <!-- </div>-->
</a-col> <!-- </a-col>-->
</a-row> <!-- </a-row>-->
</a-checkbox-group> <!-- </a-checkbox-group>-->
<div v-else><h3>无配置信息!</h3></div> <!-- <div v-else><h3>无配置信息!</h3></div>-->
</a-tab-pane> <!-- </a-tab-pane>-->
<!--<a-tab-pane tab="按钮权限" key="2">敬请期待!!!</a-tab-pane>--> <!-- &lt;!&ndash;<a-tab-pane tab="按钮权限" key="2">敬请期待!!!</a-tab-pane>&ndash;&gt;-->
</a-tabs> <!-- </a-tabs>-->
</a-drawer> <!-- </a-drawer>-->
</template> <!--</template>-->
<script> <!--<script>-->
import ARow from 'ant-design-vue/es/grid/Row' <!-- import ARow from 'ant-design-vue/es/grid/Row'-->
import ACol from 'ant-design-vue/es/grid/Col' <!-- import ACol from 'ant-design-vue/es/grid/Col'-->
import { getAction,postAction } from '@/api/manage' <!-- import { getAction,postAction } from '@/api/manage'-->
export default { <!-- export default {-->
name: 'DeptRoleDataruleModal', <!-- name: 'DeptRoleDataruleModal',-->
components: { ACol, ARow }, <!-- components: { ACol, ARow },-->
data(){ <!-- data(){-->
return { <!-- return {-->
departId:'', <!-- departId:'',-->
functionId:'', <!-- functionId:'',-->
roleId:'', <!-- roleId:'',-->
visible:false, <!-- visible:false,-->
tabList: [{ <!-- tabList: [{-->
key: '1', <!-- key: '1',-->
tab: '数据规则', <!-- tab: '数据规则',-->
}, { <!-- }, {-->
key: '2', <!-- key: '2',-->
tab: '按钮权限', <!-- tab: '按钮权限',-->
}], <!-- }],-->
activeTabKey: '1', <!-- activeTabKey: '1',-->
url:{ <!-- url:{-->
datarule:"/sys/sysDepartRole/datarule", <!-- datarule:"/sys/sysDepartRole/datarule",-->
}, <!-- },-->
dataruleList:[], <!-- dataruleList:[],-->
dataruleChecked:[] <!-- dataruleChecked:[]-->
} <!-- }-->
}, <!-- },-->
methods:{ <!-- methods:{-->
loadData(){ <!-- loadData(){-->
getAction(`${this.url.datarule}/${this.functionId}/${this.departId}/${this.roleId}`).then(res=>{ <!-- getAction(`${this.url.datarule}/${this.functionId}/${this.departId}/${this.roleId}`).then(res=>{-->
console.log(res) <!-- console.log(res)-->
if(res.success){ <!-- if(res.success){-->
this.dataruleList = res.result.datarule <!-- this.dataruleList = res.result.datarule-->
let drChecked = res.result.drChecked <!-- let drChecked = res.result.drChecked-->
if(drChecked){ <!-- if(drChecked){-->
this.dataruleChecked = drChecked.split(",") <!-- this.dataruleChecked = drChecked.split(",")-->
} <!-- }-->
} <!-- }-->
}) <!-- })-->
}, <!-- },-->
saveDataruleForRole(){ <!-- saveDataruleForRole(){-->
if(!this.dataruleChecked || this.dataruleChecked.length==0){ <!-- if(!this.dataruleChecked || this.dataruleChecked.length==0){-->
this.$message.warning("请注意，现未勾选任何数据权限!") <!-- this.$message.warning("请注意，现未勾选任何数据权限!")-->
} <!-- }-->
let params = { <!-- let params = {-->
permissionId:this.functionId, <!-- permissionId:this.functionId,-->
roleId:this.roleId, <!-- roleId:this.roleId,-->
dataRuleIds:this.dataruleChecked.join(",") <!-- dataRuleIds:this.dataruleChecked.join(",")-->
} <!-- }-->
console.log("保存数据权限",params) <!-- console.log("保存数据权限",params)-->
postAction(this.url.datarule,params).then(res=>{ <!-- postAction(this.url.datarule,params).then(res=>{-->
if(res.success){ <!-- if(res.success){-->
this.$message.success(res.message) <!-- this.$message.success(res.message)-->
}else{ <!-- }else{-->
this.$message.error(res.message) <!-- this.$message.error(res.message)-->
} <!-- }-->
}) <!-- })-->
}, <!-- },-->
show(functionId,departId,roleId){ <!-- show(functionId,departId,roleId){-->
this.onReset() <!-- this.onReset()-->
this.departId = departId <!-- this.departId = departId-->
this.functionId = functionId <!-- this.functionId = functionId-->
this.roleId = roleId <!-- this.roleId = roleId-->
this.visible=true <!-- this.visible=true-->
this.loadData() <!-- this.loadData()-->
}, <!-- },-->
onClose(){ <!-- onClose(){-->
this.visible=false <!-- this.visible=false-->
this.onReset() <!-- this.onReset()-->
}, <!-- },-->
onTabChange (key) { <!-- onTabChange (key) {-->
this.activeTabKey = key <!-- this.activeTabKey = key-->
}, <!-- },-->
onReset(){ <!-- onReset(){-->
this.functionId='' <!-- this.functionId=''-->
this.roleId='' <!-- this.roleId=''-->
this.dataruleList=[] <!-- this.dataruleList=[]-->
this.dataruleChecked=[] <!-- this.dataruleChecked=[]-->
} <!-- }-->
} <!-- }-->
} <!-- }-->
</script> <!--</script>-->
<style scoped> <!--<style scoped>-->
</style> <!--</style>-->
jero-web/src/views/system/modules/SelectUserModal.vue
+1 -1
View File
@@ -17,7 +17,7 @@
<a-col :span="10"> <a-col :span="10">
<a-form-item label="用户账号"> <a-form-item label="用户账号">
<a-input placeholder="请输入用户账号" v-model="queryParam.username"></a-input> <j-input placeholder="请输入用户账号" v-model="queryParam.username"></j-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
jero-web/src/views/system/modules/SysDepartRoleModal.vue
+150 -150
View File
@@ -1,157 +1,157 @@
<template> <!--<template>-->
<a-modal <!-- <a-modal-->
:title="title" <!-- :title="title"-->
:width="800" <!-- :width="800"-->
:visible="visible" <!-- :visible="visible"-->
:confirmLoading="confirmLoading" <!-- :confirmLoading="confirmLoading"-->
@ok="handleOk" <!-- @ok="handleOk"-->
@cancel="handleCancel" <!-- @cancel="handleCancel"-->
cancelText="关闭"> <!-- cancelText="关闭">-->
<a-spin :spinning="confirmLoading"> <!-- <a-spin :spinning="confirmLoading">-->
<a-form-model ref="form" :model="model" :rules="validatorRules"> <!-- <a-form-model ref="form" :model="model" :rules="validatorRules">-->
<a-form-model-item <!-- <a-form-model-item-->
:labelCol="labelCol" <!-- :labelCol="labelCol"-->
:wrapperCol="wrapperCol" <!-- :wrapperCol="wrapperCol"-->
prop="roleName" <!-- prop="roleName"-->
label="部门角色名称"> <!-- label="部门角色名称">-->
<a-input placeholder="请输入部门角色名称" v-model="model.roleName"/> <!-- <a-input placeholder="请输入部门角色名称" v-model="model.roleName"/>-->
</a-form-model-item> <!-- </a-form-model-item>-->
<a-form-model-item <!-- <a-form-model-item-->
:labelCol="labelCol" <!-- :labelCol="labelCol"-->
:wrapperCol="wrapperCol" <!-- :wrapperCol="wrapperCol"-->
prop="roleCode" <!-- prop="roleCode"-->
label="部门角色编码"> <!-- label="部门角色编码">-->
<a-input placeholder="请输入部门角色编码" v-model="model.roleCode"/> <!-- <a-input placeholder="请输入部门角色编码" v-model="model.roleCode"/>-->
</a-form-model-item> <!-- </a-form-model-item>-->
<a-form-model-item <!-- <a-form-model-item-->
:labelCol="labelCol" <!-- :labelCol="labelCol"-->
:wrapperCol="wrapperCol" <!-- :wrapperCol="wrapperCol"-->
prop="description" <!-- prop="description"-->
label="描述"> <!-- label="描述">-->
<a-input placeholder="请输入描述" v-model="model.description"/> <!-- <a-input placeholder="请输入描述" v-model="model.description"/>-->
</a-form-model-item> <!-- </a-form-model-item>-->
</a-form-model> <!-- </a-form-model>-->
</a-spin> <!-- </a-spin>-->
</a-modal> <!-- </a-modal>-->
</template> <!--</template>-->
<script> <!--<script>-->
import { httpAction } from '@/api/manage' <!-- import { httpAction } from '@/api/manage'-->
import {duplicateCheck } from '@/api/api' <!-- import {duplicateCheck } from '@/api/api'-->
export default { <!-- export default {-->
name: "SysDepartRoleModal", <!-- name: "SysDepartRoleModal",-->
data () { <!-- data () {-->
return { <!-- return {-->
title:"操作", <!-- title:"操作",-->
visible: false, <!-- visible: false,-->
model: {}, <!-- model: {},-->
labelCol: { <!-- labelCol: {-->
xs: { span: 24 }, <!-- xs: { span: 24 },-->
sm: { span: 5 }, <!-- sm: { span: 5 },-->
}, <!-- },-->
wrapperCol: { <!-- wrapperCol: {-->
xs: { span: 24 }, <!-- xs: { span: 24 },-->
sm: { span: 16 }, <!-- sm: { span: 16 },-->
}, <!-- },-->
confirmLoading: false, <!-- confirmLoading: false,-->
validatorRules:{ <!-- validatorRules:{-->
roleName:[ <!-- roleName:[-->
{ required: true, message: '请输入部门角色名称!' }, <!-- { required: true, message: '请输入部门角色名称!' },-->
{ min: 2, max: 30, message: '长度在 2 到 30 个字符', trigger: 'blur' } <!-- { min: 2, max: 30, message: '长度在 2 到 30 个字符', trigger: 'blur' }-->
], <!-- ],-->
roleCode: [ <!-- roleCode: [-->
{ required: true, message: '请输入部门角色编码!'}, <!-- { required: true, message: '请输入部门角色编码!'},-->
{ min: 0, max: 64, message: '长度不超过 64 个字符', trigger: 'blur' }, <!-- { min: 0, max: 64, message: '长度不超过 64 个字符', trigger: 'blur' },-->
{ validator: this.validateRoleCode} <!-- { validator: this.validateRoleCode}-->
], <!-- ],-->
description: [ <!-- description: [-->
{ min: 0, max: 126, message: '长度不超过 126 个字符', trigger: 'blur' } <!-- { min: 0, max: 126, message: '长度不超过 126 个字符', trigger: 'blur' }-->
] <!-- ]-->
}, <!-- },-->
url: { <!-- url: {-->
add: "/sys/sysDepartRole/add", <!-- add: "/sys/sysDepartRole/add",-->
edit: "/sys/sysDepartRole/edit", <!-- edit: "/sys/sysDepartRole/edit",-->
}, <!-- },-->
} <!-- }-->
}, <!-- },-->
created () { <!-- created () {-->
}, <!-- },-->
methods: { <!-- methods: {-->
add (departId) { <!-- add (departId) {-->
this.edit({},departId); <!-- this.edit({},departId);-->
}, <!-- },-->
edit (record,departId) { <!-- edit (record,departId) {-->
this.departId = departId; <!-- this.departId = departId;-->
this.model = Object.assign({}, record); <!-- this.model = Object.assign({}, record);-->
this.visible = true; <!-- this.visible = true;-->
}, <!-- },-->
close () { <!-- close () {-->
this.$emit('close'); <!-- this.$emit('close');-->
this.visible = false; <!-- this.visible = false;-->
this.$refs.form.resetFields() <!-- this.$refs.form.resetFields()-->
}, <!-- },-->
handleOk () { <!-- handleOk () {-->
const that = this; <!-- const that = this;-->
// 触发表单验证 <!-- // 触发表单验证-->
this.$refs.form.validate(valid => { <!-- this.$refs.form.validate(valid => {-->
if (valid) { <!-- if (valid) {-->
that.confirmLoading = true; <!-- that.confirmLoading = true;-->
let httpurl = ''; <!-- let httpurl = '';-->
let method = ''; <!-- let method = '';-->
if(!this.model.id){ <!-- if(!this.model.id){-->
httpurl+=this.url.add; <!-- httpurl+=this.url.add;-->
method = 'post'; <!-- method = 'post';-->
}else{ <!-- }else{-->
httpurl+=this.url.edit; <!-- httpurl+=this.url.edit;-->
method = 'put'; <!-- method = 'put';-->
} <!-- }-->
this.model.departId = this.departId; <!-- this.model.departId = this.departId;-->
httpAction(httpurl,this.model,method).then((res)=>{ <!-- httpAction(httpurl,this.model,method).then((res)=>{-->
if(res.success){ <!-- if(res.success){-->
that.$message.success(res.message); <!-- that.$message.success(res.message);-->
that.$emit('ok'); <!-- that.$emit('ok');-->
}else{ <!-- }else{-->
that.$message.warning(res.message); <!-- that.$message.warning(res.message);-->
} <!-- }-->
}).finally(() => { <!-- }).finally(() => {-->
that.confirmLoading = false; <!-- that.confirmLoading = false;-->
that.close(); <!-- that.close();-->
}) <!-- })-->
}else{ <!-- }else{-->
return false; <!-- return false;-->
} <!-- }-->
}) <!-- })-->
}, <!-- },-->
handleCancel () { <!-- handleCancel () {-->
this.close() <!-- this.close()-->
}, <!-- },-->
validateRoleCode(rule, value, callback){ <!-- validateRoleCode(rule, value, callback){-->
if(/[\u4E00-\u9FA5]/g.test(value)){ <!-- if(/[\u4E00-\u9FA5]/g.test(value)){-->
callback("部门角色编码不可输入汉字!"); <!-- callback("部门角色编码不可输入汉字!");-->
}else{ <!-- }else{-->
var params = { <!-- var params = {-->
tableName: "sys_depart_role", <!-- tableName: "sys_depart_role",-->
fieldName: "role_code", <!-- fieldName: "role_code",-->
fieldVal: value, <!-- fieldVal: value,-->
dataId: this.model.id, <!-- dataId: this.model.id,-->
}; <!-- };-->
duplicateCheck(params).then((res)=>{ <!-- duplicateCheck(params).then((res)=>{-->
if(res.success){ <!-- if(res.success){-->
callback(); <!-- callback();-->
}else{ <!-- }else{-->
callback(res.message); <!-- callback(res.message);-->
} <!-- }-->
}); <!-- });-->
} <!-- }-->
} <!-- }-->
} <!-- }-->
} <!-- }-->
</script> <!--</script>-->
<style lang="less" scoped> <!--<style lang="less" scoped>-->
</style> <!--</style>-->