diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java index bdf588eb..0f3369ad 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java @@ -11,9 +11,11 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.common.exception.JeroBootException; +import com.jero.common.system.base.controller.JeroController; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; +import org.apache.poi.ss.formula.functions.T; import org.apache.shiro.SecurityUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import com.jero.common.api.vo.Result; @@ -51,6 +53,8 @@ import java.io.IOException; import java.util.*; import java.util.stream.Collectors; +import static com.sun.activation.registries.LogSupport.log; + /** *

* 用户表 前端控制器 @@ -65,7 +69,7 @@ import java.util.stream.Collectors; public class SysUserController { @Autowired private ISysBaseAPI sysBaseAPI; - + @Autowired private ISysUserService sysUserService; @@ -87,6 +91,20 @@ public class SysUserController { @Resource private BaseCommonService baseCommonService; + private static String SELECTED_ROLES ="selectedroles"; + private static String RSA_PUBLIC_KEY ="rsaPublicKey"; + private static String OPTION_SUCCESS = "操作成功!"; + private static String INEXISTENCE = "未找到对应实体"; + private static String USER_ERROR_MSG = "用户不存在！"; + private static final String USER_NAME = "username"; + private static final String USER_ID = "user_id"; + private static String ROLE_ID = "role_id"; + private static String DEL_SUCCESS = "删除成功!"; + private static String DEL_FAILE = "删除失败！"; + private static String DEP_ID = "dep_id"; + private static String PHONE = "phone"; + private static String SMSCODE = "smscode"; + /** * 获取用户列表数据 * @param user @@ -97,17 +115,18 @@ public class SysUserController { */ //@RequiresPermissions("sys:user:list") @PermissionData(pageComponent = "system/UserList") - @RequestMapping(value = "/page", method = RequestMethod.GET) +// @RequestMapping(value = "/page", method = RequestMethod.GET) + @GetMapping("/page") public Result> queryPageList(SysUser user, @RequestParam(name="departId", required = false) String departId, @RequestParam(name="roleId", required = false) String roleId, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,HttpServletRequest req) { - Result> result = new Result>(); + Result> result = new Result<>(); QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(user, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); + Page page = new Page<>(pageNo, pageSize); List subDepIds = null; if (StrUtil.isNotEmpty(departId)){ subDepIds = sysDepartService.getSubDepIdsByDepId(departId); @@ -119,7 +138,7 @@ public class SysUserController { //批量查询用户的所属部门 //step.1 先拿到全部的 useids List userIds = pageList.getRecords().stream().map(SysUser::getId).collect(Collectors.toList()); - if(userIds!=null && userIds.size()>0){ + if(userIds!=null && !userIds.isEmpty()){ //step.2 通过 useids，一次性查询用户的所属部门名字 Map useDepNames = sysUserService.getDepNamesByUserIds(userIds); //step.3 通过 useids，一次性查询用户的角色名字 @@ -133,17 +152,18 @@ public class SysUserController { result.setSuccess(true); result.setResult(pageList); - log.info(pageList.toString()); + SysUserController.log.info(pageList.toString()); return result; } @RequiresPermissions("user:add") - @RequestMapping(value = "/add", method = RequestMethod.POST) +// @RequestMapping(value = "/add", method = RequestMethod.POST) + @PostMapping("/add") public Result add(@RequestBody JSONObject jsonObject) { try { - String selectedRoles = jsonObject.getString("selectedroles"); + String selectedRoles = jsonObject.getString(SELECTED_ROLES); String selectedDeparts = jsonObject.getString("selecteddeparts"); - String rsaPublicKey = jsonObject.getString("rsaPublicKey"); + String rsaPublicKey = jsonObject.getString(RSA_PUBLIC_KEY); String rsaPrivateKey = String.valueOf(redisUtil.get(rsaPublicKey)); SysUser user = JSON.parseObject(jsonObject.toJSONString(), SysUser.class); @@ -173,25 +193,26 @@ public class SysUserController { // 保存用户走一个service 保证事务 sysUserService.saveUser(user, selectedRoles, selectedDeparts); - return Result.OK("操作成功!"); + return Result.OK(OPTION_SUCCESS); } catch (Exception e) { - log.error(e.getMessage(), e); + SysUserController.log.error(e.getMessage(), e); return Result.error("操作失败"); } } @RequiresPermissions("user:edit") - @RequestMapping(value = "/edit", method = RequestMethod.PUT) +// @RequestMapping(value = "/edit", method = RequestMethod.PUT) + @PutMapping("/edit") public Result edit(@RequestBody JSONObject jsonObject) { - String rsaPublicKey = jsonObject.getString("rsaPublicKey"); - String roles = jsonObject.getString("selectedroles"); + String rsaPublicKey = jsonObject.getString(RSA_PUBLIC_KEY); + String roles = jsonObject.getString(SELECTED_ROLES); String departs = jsonObject.getString("selecteddeparts"); String rsaPrivateKey = String.valueOf(redisUtil.get(rsaPublicKey)); try { SysUser sysUser = sysUserService.getById(jsonObject.getString("id")); baseCommonService.addLog("编辑用户，id： " +jsonObject.getString("id") ,CommonConstant.LOG_TYPE_2, 2); if(sysUser==null) { - return Result.error("未找到对应实体"); + return Result.error(INEXISTENCE); }else { SysUser user = JSON.parseObject(jsonObject.toJSONString(), SysUser.class); String email = null; @@ -215,23 +236,25 @@ public class SysUserController { user.setPassword(sysUser.getPassword()); // 修改用户走一个service 保证事务 sysUserService.editUser(user, roles, departs); - return Result.OK("操作成功!"); + return Result.OK(OPTION_SUCCESS); } } catch (Exception e) { - log.error(e.getMessage(), e); + SysUserController.log.error(e.getMessage(), e); return Result.error("操作失败"); } } - @RequestMapping(value = "/delete", method = RequestMethod.DELETE) - public Result delete(@RequestParam(name="id",required=true) String id) { +// @RequestMapping(value = "/delete", method = RequestMethod.DELETE) + @DeleteMapping("/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { baseCommonService.addLog("删除用户，id： " +id ,CommonConstant.LOG_TYPE_2, 3); this.sysUserService.deleteUser(id); return Result.OK("删除用户成功"); } - @RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE) - public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { +// @RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE) + @DeleteMapping("/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { baseCommonService.addLog("批量删除用户， ids： " +ids ,CommonConstant.LOG_TYPE_2, 3); this.sysUserService.deleteBatchUsers(ids); return Result.OK("批量删除用户成功"); @@ -239,7 +262,8 @@ public class SysUserController { //@RequiresPermissions("sys:user:list") - @RequestMapping(value = "/frozenBatch", method = RequestMethod.PUT) +// @RequestMapping(value = "/frozenBatch", method = RequestMethod.PUT) + @PutMapping("/frozenBatch") public Result frozenBatch(@RequestBody JSONObject jsonObject) { try { String ids = jsonObject.getString("ids"); @@ -252,29 +276,31 @@ public class SysUserController { } } } catch (Exception e) { - log.error(e.getMessage(), e); + SysUserController.log.error(e.getMessage(), e); return Result.error("操作失败"+e.getMessage()); } - return Result.OK("操作成功!"); + return Result.OK(OPTION_SUCCESS); } //@RequiresPermissions("sys:user:list") - @RequestMapping(value = "/queryById", method = RequestMethod.GET) +// @RequestMapping(value = "/queryById", method = RequestMethod.GET) + @GetMapping("/queryById") public Result queryById(@RequestParam(name = "id", required = true) String id) { SysUser sysUser = sysUserService.getById(id); if (sysUser == null) { - return Result.error("未找到对应实体"); + return Result.error(INEXISTENCE); } else { return Result.OK(sysUser); } } //@RequiresPermissions("sys:user:list") - @RequestMapping(value = "/queryUserRole", method = RequestMethod.GET) +// @RequestMapping(value = "/queryUserRole", method = RequestMethod.GET) + @GetMapping("/queryUserRole") public Result> queryUserRole(@RequestParam(name = "userid", required = true) String userid) { - List list = new ArrayList(); + List list = new ArrayList<>(); List userRole = sysUserRoleService.list(new QueryWrapper().lambda().eq(SysUserRole::getUserId, userid)); - if (userRole == null || userRole.size() <= 0) { + if (userRole == null || userRole.isEmpty()) { return Result.error("未找到用户相关角色信息"); } else { for (SysUserRole sysUserRole : userRole) { @@ -293,7 +319,8 @@ public class SysUserController { * @return */ //@RequiresPermissions("sys:user:list") - @RequestMapping(value = "/checkOnlyUser", method = RequestMethod.GET) +// @RequestMapping(value = "/checkOnlyUser", method = RequestMethod.GET) + @GetMapping("/checkOnlyUser") public Result checkOnlyUser(SysUser sysUser) { Result result = new Result<>(); //如果此参数为false则程序发生异常 @@ -301,7 +328,7 @@ public class SysUserController { try { //通过传入信息查询新的用户信息 sysUser.setPassword(null); - SysUser user = sysUserService.getOne(new QueryWrapper(sysUser)); + SysUser user = sysUserService.getOne(new QueryWrapper<>(sysUser)); if (user != null) { result.setSuccess(false); result.setMessage("用户账号已存在"); @@ -320,11 +347,12 @@ public class SysUserController { /** * 修改密码 */ - @RequestMapping(value = "/changePassword", method = RequestMethod.PUT) - public Result changePassword(@RequestBody SysUser sysUser) { +// @RequestMapping(value = "/changePassword", method = RequestMethod.PUT) + @PutMapping("/changePassword") + public Result changePassword(@RequestBody SysUser sysUser) { SysUser u = this.sysUserService.getOne(new LambdaQueryWrapper().eq(SysUser::getUsername, sysUser.getUsername())); if (u == null) { - return Result.error("用户不存在！"); + return Result.error(USER_ERROR_MSG); } sysUser.setId(u.getId()); return sysUserService.changePassword(sysUser); @@ -337,12 +365,13 @@ public class SysUserController { * @return */ //@RequiresPermissions("sys:user:list") - @RequestMapping(value = "/userDepartList", method = RequestMethod.GET) +// @RequestMapping(value = "/userDepartList", method = RequestMethod.GET) + @GetMapping("/userDepartList") public Result> getUserDepartsList(@RequestParam(name = "userId", required = true) String userId) { Result> result = new Result<>(); try { List depIdModelList = this.sysUserDepartService.queryDepartIdsOfUser(userId); - if (depIdModelList != null && depIdModelList.size() > 0) { + if (depIdModelList != null && !depIdModelList.isEmpty()) { result.setSuccess(true); result.setMessage("查找成功"); result.setResult(depIdModelList); @@ -352,7 +381,7 @@ public class SysUserController { } return result; } catch (Exception e) { - log.error(e.getMessage(), e); + SysUserController.log.error(e.getMessage(), e); result.setSuccess(false); result.setMessage("查找过程中出现了异常: " + e.getMessage()); return result; @@ -366,10 +395,11 @@ public class SysUserController { * @return */ //@RequiresPermissions("sys:user:list") - @RequestMapping(value = "/generateUserId", method = RequestMethod.GET) +// @RequestMapping(value = "/generateUserId", method = RequestMethod.GET) + @GetMapping("/generateUserId") public Result generateUserId() { Result result = new Result<>(); - System.out.println("我执行了,生成用户ID=============================="); + log("我执行了,生成用户ID=============================="); String userId = UUID.randomUUID().toString().replace("-", ""); result.setSuccess(true); result.setResult(userId); @@ -383,7 +413,8 @@ public class SysUserController { * @return */ //@RequiresPermissions("sys:user:list") - @RequestMapping(value = "/queryUserByDepId", method = RequestMethod.GET) +// @RequestMapping(value = "/queryUserByDepId", method = RequestMethod.GET) + @GetMapping("/queryUserByDepId") public Result> queryUserByDepId(@RequestParam(name = "id", required = true) String id,@RequestParam(name="realname",required=false) String realname) { Result> result = new Result<>(); SysDepart sysDepart = sysDepartService.getById(id); @@ -393,11 +424,11 @@ public class SysUserController { //step.1 先拿到全部的 useids //step.2 通过 useids，一次性查询用户的所属部门名字 List userIds = userList.stream().map(SysUser::getId).collect(Collectors.toList()); - if(userIds!=null && userIds.size()>0){ + if(userIds!=null && !userIds.isEmpty()){ Map useDepNames = sysUserService.getDepNamesByUserIds(userIds); - userList.forEach(item->{ - item.setOrgCodeTxt(useDepNames.get(item.getId())); - }); + userList.forEach(item-> + item.setOrgCodeTxt(useDepNames.get(item.getId())) + ); } try { @@ -405,7 +436,7 @@ public class SysUserController { result.setResult(userList); return result; } catch (Exception e) { - log.error(e.getMessage(), e); + SysUserController.log.error(e.getMessage(), e); result.setSuccess(false); return result; } @@ -417,13 +448,14 @@ public class SysUserController { * @param username * @return */ - @RequestMapping(value = "/queryUserComponentData", method = RequestMethod.GET) +// @RequestMapping(value = "/queryUserComponentData", method = RequestMethod.GET) + @GetMapping("/queryUserComponentData") public Result> queryUserComponentData( @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, @RequestParam(name = "departId", required = false) String departId, @RequestParam(name="realname",required=false) String realname, - @RequestParam(name="username",required=false) String username) { + @RequestParam(name=USER_NAME,required=false) String username) { IPage pageList = sysUserDepartService.queryDepartUserPageList(departId, username, realname, pageSize, pageNo); return Result.OK(pageList); } @@ -450,12 +482,12 @@ public class SysUserController { List pageList = sysUserService.list(queryWrapper); //导出文件名称 - mv.addObject(NormalExcelConstants.FILE_NAME, "用户列表"); - mv.addObject(NormalExcelConstants.CLASS, SysUser.class); + mv.addObject(JeroController.FILE_NAME, "用户列表"); + mv.addObject(JeroController.CLASS, SysUser.class); LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); ExportParams exportParams = new ExportParams("用户列表数据", "导出人:"+user.getRealname(), "导出信息"); exportParams.setImageBasePath(upLoadPath); - mv.addObject(NormalExcelConstants.PARAMS, exportParams); + mv.addObject(JeroController.PARAMS, exportParams); mv.addObject(NormalExcelConstants.DATA_LIST, pageList); return mv; } @@ -468,13 +500,15 @@ public class SysUserController { * @return */ @RequiresPermissions("sys:user:import") - @RequestMapping(value = "/importExcel", method = RequestMethod.POST) - public Result importExcel(HttpServletRequest request, HttpServletResponse response)throws IOException { +// @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + @PostMapping("/importExcel") + public Result importExcel(HttpServletRequest request, HttpServletResponse response)throws IOException { MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request; Map fileMap = multipartRequest.getFileMap(); // 错误信息 List errorMessage = new ArrayList<>(); - int successLines = 0, errorLines = 0; + int successLines = 0; + int errorLines = 0; for (Map.Entry entity : fileMap.entrySet()) { MultipartFile file = entity.getValue();// 获取上传文件对象 ImportParams params = new ImportParams(); @@ -513,7 +547,7 @@ public class SysUserController { errorMessage.add("第 " + lineNumber + " 行：电子邮件已经存在，忽略导入。"); } else { errorMessage.add("第 " + lineNumber + " 行：未知错误，忽略导入"); - log.error(e.getMessage(), e); + SysUserController.log.error(e.getMessage(), e); } } // 批量将部门和用户信息建立关联关系 TODO 错误需修改 @@ -531,12 +565,12 @@ public class SysUserController { } } catch (Exception e) { errorMessage.add("发生异常：" + e.getMessage()); - log.error(e.getMessage(), e); + SysUserController.log.error(e.getMessage(), e); } finally { try { file.getInputStream().close(); } catch (IOException e) { - log.error(e.getMessage(), e); + SysUserController.log.error(e.getMessage(), e); } } } @@ -549,7 +583,8 @@ public class SysUserController { * @return */ //@RequiresPermissions("sys:user:list") - @RequestMapping(value = "/queryByIds", method = RequestMethod.GET) +// @RequestMapping(value = "/queryByIds", method = RequestMethod.GET) + @GetMapping("/queryByIds") public Result> queryByIds(@RequestParam String userIds) { Result> result = new Result<>(); String[] userId = userIds.split(","); @@ -563,13 +598,14 @@ public class SysUserController { /** * 首页用户重置密码 */ - @RequestMapping(value = "/updatePassword", method = RequestMethod.PUT) - public Result updatePassword(@RequestBody JSONObject json) { - String username = json.getString("username"); +// @RequestMapping(value = "/updatePassword", method = RequestMethod.PUT) + @PutMapping("/updatePassword") + public Result updatePassword(@RequestBody JSONObject json) { + String username = json.getString(USER_NAME); String oldpassword = json.getString("oldpassword"); String password = json.getString("password"); String confirmpassword = json.getString("confirmpassword"); - String RSAPublicKey = json.getString("rsaPublicKey"); + String RSAPublicKey = json.getString(RSA_PUBLIC_KEY); LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal(); if(!sysUser.getUsername().equals(username)){ @@ -583,23 +619,24 @@ public class SysUserController { password = CommonUtils.decryptBtRsaPriKey(password, RSAPrivateKey); confirmpassword = CommonUtils.decryptBtRsaPriKey(confirmpassword, RSAPrivateKey); }catch (Exception e){ - log.error(e.getMessage(),e); + SysUserController.log.error(e.getMessage(),e); } SysUser user = this.sysUserService.getOne(new LambdaQueryWrapper().eq(SysUser::getUsername, username)); if(user==null) { - return Result.error("用户不存在！"); + return Result.error(USER_ERROR_MSG); } return sysUserService.resetPassword(username,oldpassword,password,confirmpassword); } //@RequiresPermissions("sys:user:list") - @RequestMapping(value = "/userRoleList", method = RequestMethod.GET) +// @RequestMapping(value = "/userRoleList", method = RequestMethod.GET) + @GetMapping("/userRoleList") public Result> userRoleList(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) { - Result> result = new Result>(); - Page page = new Page(pageNo, pageSize); + Result> result = new Result<>(); + Page page = new Page<>(pageNo, pageSize); String roleId = req.getParameter("roleId"); - String username = req.getParameter("username"); + String username = req.getParameter(USER_NAME); IPage pageList = sysUserService.getUserByRoleId(page,roleId,username); result.setSuccess(true); result.setResult(pageList); @@ -613,26 +650,27 @@ public class SysUserController { * @return */ @RequiresPermissions("user:add") - @RequestMapping(value = "/addSysUserRole", method = RequestMethod.POST) +// @RequestMapping(value = "/addSysUserRole", method = RequestMethod.POST) + @PostMapping("/addSysUserRole") public Result addSysUserRole(@RequestBody SysUserRoleVO sysUserRoleVO) { - Result result = new Result(); + Result result = new Result<>(); try { String sysRoleId = sysUserRoleVO.getRoleId(); for(String sysUserId:sysUserRoleVO.getUserIdList()) { SysUserRole sysUserRole = new SysUserRole(sysUserId,sysRoleId); - QueryWrapper queryWrapper = new QueryWrapper(); - queryWrapper.eq("role_id", sysRoleId).eq("user_id",sysUserId); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq( ROLE_ID, sysRoleId).eq(USER_ID,sysUserId); SysUserRole one = sysUserRoleService.getOne(queryWrapper); if(one==null){ sysUserRoleService.save(sysUserRole); } } - result.setMessage("操作成功!"); + result.setMessage(OPTION_SUCCESS); result.setSuccess(true); return result; }catch(Exception e) { - log.error(e.getMessage(), e); + SysUserController.log.error(e.getMessage(), e); result.setSuccess(false); result.setMessage("出错了: " + e.getMessage()); return result; @@ -643,17 +681,18 @@ public class SysUserController { * @param * @return */ - @RequestMapping(value = "/deleteUserRole", method = RequestMethod.DELETE) +// @RequestMapping(value = "/deleteUserRole", method = RequestMethod.DELETE) + @DeleteMapping("/deleteUserRole") public Result deleteUserRole(@RequestParam(name="roleId") String roleId, @RequestParam(name="userId",required=true) String userId) { try { - QueryWrapper queryWrapper = new QueryWrapper(); - queryWrapper.eq("role_id", roleId).eq("user_id",userId); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq(ROLE_ID, roleId).eq(USER_ID,userId); sysUserRoleService.remove(queryWrapper); - return Result.OK("删除成功!"); + return Result.OK(DEL_SUCCESS); }catch(Exception e) { - log.error(e.getMessage(), e); - return Result.error("删除失败！"); + SysUserController.log.error(e.getMessage(), e); + return Result.error(DEL_FAILE); } } @@ -663,32 +702,34 @@ public class SysUserController { * @param * @return */ - @RequestMapping(value = "/deleteUserRoleBatch", method = RequestMethod.DELETE) +// @RequestMapping(value = "/deleteUserRoleBatch", method = RequestMethod.DELETE) + @DeleteMapping("/deleteUserRoleBatch") public Result deleteUserRoleBatch( @RequestParam(name="roleId") String roleId, @RequestParam(name="userIds",required=true) String userIds) { try { - QueryWrapper queryWrapper = new QueryWrapper(); - queryWrapper.eq("role_id", roleId).in("user_id",Arrays.asList(userIds.split(","))); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq(ROLE_ID, roleId).in(USER_ID,Arrays.asList(userIds.split(","))); sysUserRoleService.remove(queryWrapper); - return Result.OK("删除成功!"); + return Result.OK(DEL_SUCCESS); }catch(Exception e) { - log.error(e.getMessage(), e); - return Result.error("删除失败！"); + SysUserController.log.error(e.getMessage(), e); + return Result.error(DEL_FAILE); } } /** * 部门用户列表 */ - @RequestMapping(value = "/departUserList", method = RequestMethod.GET) +// @RequestMapping(value = "/departUserList", method = RequestMethod.GET) + @GetMapping("/departUserList") //@RequiresPermissions("sys:user:list") public Result> departUserList(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) { - Result> result = new Result>(); - Page page = new Page(pageNo, pageSize); + Result> result = new Result<>(); + Page page = new Page<>(pageNo, pageSize); String depId = req.getParameter("depId"); - String username = req.getParameter("username"); + String username = req.getParameter(USER_NAME); //根据部门ID查询,当前和下级所有的部门IDS List subDepids = new ArrayList<>(); //部门id为空时，查询我的部门下所有用户 @@ -701,18 +742,18 @@ public class SysUserController { }else{ subDepids = sysDepartService.getSubDepIdsByDepId(depId); } - if(subDepids != null && subDepids.size()>0){ + if(subDepids != null && !subDepids.isEmpty()){ IPage pageList = sysUserService.getUserByDepIds(page,subDepids,username); //批量查询用户的所属部门 //step.1 先拿到全部的 useids //step.2 通过 useids，一次性查询用户的所属部门名字 List userIds = pageList.getRecords().stream().map(SysUser::getId).collect(Collectors.toList()); - if(userIds!=null && userIds.size()>0){ + if(userIds!=null && !userIds.isEmpty()){ Map useDepNames = sysUserService.getDepNamesByUserIds(userIds); - pageList.getRecords().forEach(item -> { + pageList.getRecords().forEach(item -> //批量查询用户的所属部门 - item.setOrgCode(useDepNames.get(item.getId())); - }); + item.setOrgCode(useDepNames.get(item.getId())) + ); } result.setSuccess(true); result.setResult(pageList); @@ -730,13 +771,13 @@ public class SysUserController { */ @GetMapping("/queryByOrgCode") //@RequiresPermissions("sys:user:list") - public Result queryByDepartId( + public Result> queryByDepartId( @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, @RequestParam(name = "orgCode") String orgCode, SysUser userParams ) { - IPage pageList = sysUserService.queryUserByOrgCode(orgCode, userParams, new Page(pageNo, pageSize)); + IPage pageList = sysUserService.queryUserByOrgCode(orgCode, userParams, new Page(pageNo, pageSize)); return Result.OK(pageList); } @@ -744,25 +785,26 @@ public class SysUserController { * 给指定部门添加对应的用户 */ @RequiresPermissions("user:add") - @RequestMapping(value = "/editSysDepartWithUser", method = RequestMethod.POST) +// @RequestMapping(value = "/editSysDepartWithUser", method = RequestMethod.POST) + @PostMapping("/editSysDepartWithUser") public Result editSysDepartWithUser(@RequestBody SysDepartUsersVO sysDepartUsersVO) { - Result result = new Result(); + Result result = new Result<>(); try { String sysDepId = sysDepartUsersVO.getDepId(); for(String sysUserId:sysDepartUsersVO.getUserIdList()) { SysUserDepart sysUserDepart = new SysUserDepart(null,sysUserId,sysDepId); - QueryWrapper queryWrapper = new QueryWrapper(); - queryWrapper.eq("dep_id", sysDepId).eq("user_id",sysUserId); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq(DEP_ID, sysDepId).eq(USER_ID,sysUserId); SysUserDepart one = sysUserDepartService.getOne(queryWrapper); if(one==null){ sysUserDepartService.save(sysUserDepart); } } - result.setMessage("操作成功!"); + result.setMessage(OPTION_SUCCESS); result.setSuccess(true); return result; }catch(Exception e) { - log.error(e.getMessage(), e); + SysUserController.log.error(e.getMessage(), e); result.setSuccess(false); result.setMessage("出错了: " + e.getMessage()); return result; @@ -772,25 +814,27 @@ public class SysUserController { /** * 删除指定机构的用户关系 */ - @RequestMapping(value = "/deleteUserInDepart", method = RequestMethod.DELETE) +// @RequestMapping(value = "/deleteUserInDepart", method = RequestMethod.DELETE) + @DeleteMapping("/deleteUserInDepart") public Result deleteUserInDepart(@RequestParam(name="depId") String depId, @RequestParam(name="userId",required=true) String userId) { try { - QueryWrapper queryWrapper = new QueryWrapper(); - queryWrapper.eq("dep_id", depId).eq("user_id",userId); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq(DEP_ID, depId).eq(USER_ID,userId); sysUserDepartService.remove(queryWrapper); sysDepartService.deleteHeadDeptAndUserRelatedByUser(depId, userId); - return Result.OK("删除成功!"); + return Result.OK(DEL_SUCCESS); }catch(Exception e) { - log.error(e.getMessage(), e); - return Result.error("删除失败！"); + SysUserController.log.error(e.getMessage(), e); + return Result.error(DEL_FAILE); } } /** * 批量删除指定机构的用户关系 */ - @RequestMapping(value = "/deleteUserInDepartBatch", method = RequestMethod.DELETE) +// @RequestMapping(value = "/deleteUserInDepartBatch", method = RequestMethod.DELETE) + @DeleteMapping("/deleteUserInDepartBatch") @Transactional public Result deleteUserInDepartBatch( @RequestParam(name="depId") String depId, @@ -798,56 +842,57 @@ public class SysUserController { try { List userIdList = new ArrayList<>(Arrays.asList(userIds.split(","))); - QueryWrapper queryWrapper = new QueryWrapper(); - queryWrapper.eq("dep_id", depId).in("user_id", userIdList); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq(DEP_ID, depId).in(USER_ID, userIdList); sysUserDepartService.remove(queryWrapper); for (String userId : userIdList){ sysDepartService.deleteHeadDeptAndUserRelatedByUser(depId, userId); } - return Result.OK("删除成功!"); + return Result.OK(DEL_SUCCESS); }catch(Exception e) { - log.error(e.getMessage(), e); - return Result.error("删除失败！"); + SysUserController.log.error(e.getMessage(), e); + return Result.error(DEL_FAILE); } } - + /** * 查询当前用户的所有部门/当前部门编码 * @return */ //@RequiresPermissions("sys:user:list") - @RequestMapping(value = "/getCurrentUserDeparts", method = RequestMethod.GET) +// @RequestMapping(value = "/getCurrentUserDeparts", method = RequestMethod.GET) + @GetMapping("/getCurrentUserDeparts") public Result> getCurrentUserDeparts() { try { LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal(); List list = this.sysDepartService.queryUserDeparts(sysUser.getId()); - Map map = new HashMap(); + Map map = new HashMap<>(); map.put("list", list); map.put("orgCode", sysUser.getOrgCode()); return Result.OK(map); }catch(Exception e) { - log.error(e.getMessage(), e); + SysUserController.log.error(e.getMessage(), e); return Result.error("查询失败！"); } } - + /** * 用户注册接口 - * + * * @param jsonObject * @param user * @return */ @PostMapping("/register") public Result userRegister(@RequestBody JSONObject jsonObject, SysUser user) { - Result result = new Result(); - String phone = jsonObject.getString("phone"); - String smscode = jsonObject.getString("smscode"); + Result result = new Result<>(); + String phone = jsonObject.getString(PHONE); + String smscode = jsonObject.getString(SMSCODE); Object code = redisUtil.get(phone); - String username = jsonObject.getString("username"); + String username = jsonObject.getString(USER_NAME); //未设置用户名，则用手机号作为用户名 if(oConvertUtils.isEmpty(username)){ username = phone; @@ -916,9 +961,9 @@ public class SysUserController { */ @PostMapping("/phoneVerification") public Result> phoneVerification(@RequestBody JSONObject jsonObject) { - Result> result = new Result>(); - String phone = jsonObject.getString("phone"); - String smscode = jsonObject.getString("smscode"); + Result> result = new Result<>(); + String phone = jsonObject.getString(PHONE); + String smscode = jsonObject.getString(SMSCODE); Object code = redisUtil.get(phone); if (!smscode.equals(code)) { result.setMessage("手机验证码错误"); @@ -932,29 +977,29 @@ public class SysUserController { query.eq(SysUser::getPhone,phone); SysUser user = sysUserService.getOne(query); Map map = new HashMap<>(); - map.put("smscode",smscode); - map.put("username",user.getUsername()); + map.put(SMSCODE,smscode); + map.put(USER_NAME,user.getUsername()); result.setResult(map); result.setSuccess(true); return result; } - + /** * 用户更改密码 */ @GetMapping("/passwordChange") - public Result passwordChange(@RequestParam(name="username")String username, + public Result passwordChange(@RequestParam(name=USER_NAME)String username, @RequestParam(name="password")String password, @RequestParam(name="smscode")String smscode, @RequestParam(name="phone") String phone) { - Result result = new Result(); + Result result = new Result<>(); if(oConvertUtils.isEmpty(username) || oConvertUtils.isEmpty(password) || oConvertUtils.isEmpty(smscode) || oConvertUtils.isEmpty(phone) ) { result.setMessage("重置密码失败！"); result.setSuccess(false); return result; } - SysUser sysUser=new SysUser(); + SysUser sysUser; Object object= redisUtil.get(phone); if(null==object) { result.setMessage("短信验证码失效！"); @@ -982,44 +1027,44 @@ public class SysUserController { return result; } } - + /** * 根据TOKEN获取用户的部分信息（返回的数据是可供表单设计器使用的数据） - * + * * @return */ //@RequiresPermissions("sys:user:list") @GetMapping("/getUserSectionInfoByToken") - public Result getUserSectionInfoByToken(HttpServletRequest request, @RequestParam(name = "token", required = false) String token) { + public Result> getUserSectionInfoByToken(HttpServletRequest request, @RequestParam(name = "token", required = false) String token) { try { String username = null; // 如果没有传递token，就从header中获取token并获取用户信息 if (oConvertUtils.isEmpty(token)) { username = JwtUtil.getUserNameByToken(request); } else { - username = JwtUtil.getUsername(token); + username = JwtUtil.getUsername(token); } - log.debug(" ------ 通过令牌获取部分用户信息，当前用户： " + username); + SysUserController.log.debug(" ------ 通过令牌获取部分用户信息，当前用户： " + username); // 根据用户名查询用户信息 SysUser sysUser = sysUserService.getUserByName(username); - Map map = new HashMap(); + Map map = new HashMap<>(); map.put("sysUserId", sysUser.getId()); map.put("sysUserCode", sysUser.getUsername()); // 当前登录用户登录账号 map.put("sysUserName", sysUser.getRealname()); // 当前登录用户真实名称 map.put("sysOrgCode", sysUser.getOrgCode()); // 当前登录用户部门编号 - log.debug(" ------ 通过令牌获取部分用户信息，已获取的用户信息： " + map); + SysUserController.log.debug(" ------ 通过令牌获取部分用户信息，已获取的用户信息： " + map); return Result.OK(map); } catch (Exception e) { - log.error(e.getMessage(), e); + SysUserController.log.error(e.getMessage(), e); return Result.error(500, "查询失败:" + e.getMessage()); } } - + /** * 【APP端接口】获取用户列表 根据用户名和真实名 模糊匹配 * @param keyword @@ -1029,13 +1074,13 @@ public class SysUserController { */ //@RequiresPermissions("sys:user:list") @GetMapping("/appUserList") - public Result appUserList(@RequestParam(name = "keyword", required = false) String keyword, - @RequestParam(name = "username", required = false) String username, + public Result> appUserList(@RequestParam(name = "keyword", required = false) String keyword, + @RequestParam(name = USER_NAME, required = false) String username, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, @RequestParam(name = "syncFlow", required = false) String syncFlow) { try { - LambdaQueryWrapper query = new LambdaQueryWrapper(); + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); if(oConvertUtils.isNotEmpty(syncFlow)){ query.eq(SysUser::getActivitiSync, CommonConstant.ACT_SYNC_1); } @@ -1053,10 +1098,10 @@ public class SysUserController { IPage res = this.sysUserService.page(page, query); return Result.OK(res); } catch (Exception e) { - log.error(e.getMessage(), e); + SysUserController.log.error(e.getMessage(), e); return Result.error(500, "查询失败:" + e.getMessage()); } - + } /** @@ -1066,9 +1111,9 @@ public class SysUserController { */ //@RequiresPermissions("sys:user:list") @GetMapping("/recycleBin") - public Result getRecycleBin() { + public Result> getRecycleBin() { List logicDeletedUserList = sysUserService.queryLogicDeleted(); - if (logicDeletedUserList.size() > 0) { + if (!logicDeletedUserList.isEmpty()) { // 批量查询用户的所属部门 // step.1 先拿到全部的 userIds List userIds = logicDeletedUserList.stream().map(SysUser::getId).collect(Collectors.toList()); @@ -1086,8 +1131,9 @@ public class SysUserController { * @return */ //@RequiresPermissions("sys:user:list") - @RequestMapping(value = "/putRecycleBin", method = RequestMethod.PUT) - public Result putRecycleBin(@RequestBody JSONObject jsonObject, HttpServletRequest request) { +// @RequestMapping(value = "/putRecycleBin", method = RequestMethod.PUT) + @PutMapping("/putRecycleBin") + public Result putRecycleBin(@RequestBody JSONObject jsonObject, HttpServletRequest request) { String userIds = jsonObject.getString("userIds"); if (StringUtils.isNotBlank(userIds)) { SysUser updateUser = new SysUser(); @@ -1104,8 +1150,9 @@ public class SysUserController { * @param userIds 被删除的用户ID，多个id用半角逗号分割 * @return */ - @RequestMapping(value = "/deleteRecycleBin", method = RequestMethod.DELETE) - public Result deleteRecycleBin(@RequestParam("userIds") String userIds) { +// @RequestMapping(value = "/deleteRecycleBin", method = RequestMethod.DELETE) + @DeleteMapping("/deleteRecycleBin") + public Result deleteRecycleBin(@RequestParam("userIds") String userIds) { if (StringUtils.isNotBlank(userIds)) { sysUserService.removeLogicDeleted(Arrays.asList(userIds.split(","))); } @@ -1119,9 +1166,10 @@ public class SysUserController { * @return */ @RequiresPermissions("user:edit") - @RequestMapping(value = "/appEdit", method = RequestMethod.PUT) +// @RequestMapping(value = "/appEdit", method = RequestMethod.PUT) + @PutMapping("/appEdit") public Result appEdit(HttpServletRequest request,@RequestBody JSONObject jsonObject) { - Result result = new Result(); + Result result = new Result<>(); try { String username = JwtUtil.getUserNameByToken(request); SysUser sysUser = sysUserService.getUserByName(username); @@ -1129,7 +1177,7 @@ public class SysUserController { String realname=jsonObject.getString("realname"); String avatar=jsonObject.getString("avatar"); String sex=jsonObject.getString("sex"); - String phone=jsonObject.getString("phone"); + String phone=jsonObject.getString(PHONE); String email=jsonObject.getString("email"); Date birthday=jsonObject.getDate("birthday"); SysUser userPhone = sysUserService.getUserByPhone(phone); @@ -1164,7 +1212,7 @@ public class SysUserController { sysUserService.updateById(sysUser); } } catch (Exception e) { - log.error(e.getMessage(), e); + SysUserController.log.error(e.getMessage(), e); return Result.error("操作失败!"); } return result; @@ -1174,9 +1222,10 @@ public class SysUserController { * @param clientId * @return */ - @RequestMapping(value = "/saveClientId", method = RequestMethod.GET) +// @RequestMapping(value = "/saveClientId", method = RequestMethod.GET) + @PutMapping("/saveClientId") public Result saveClientId(HttpServletRequest request,@RequestParam("clientId")String clientId) { - Result result = new Result(); + Result result = new Result<>(); try { String username = JwtUtil.getUserNameByToken(request); SysUser sysUser = sysUserService.getUserByName(username); @@ -1187,7 +1236,7 @@ public class SysUserController { sysUserService.updateById(sysUser); } } catch (Exception e) { - log.error(e.getMessage(), e); + SysUserController.log.error(e.getMessage(), e); return Result.error("操作失败!"); } return result; @@ -1200,9 +1249,9 @@ public class SysUserController { */ //@RequiresPermissions("sys:user:list") @GetMapping("/queryChildrenByUsername") - public Result queryChildrenByUsername(@RequestParam("userId") String userId) { + public Result> queryChildrenByUsername(@RequestParam("userId") String userId) { //获取用户信息 - Map map=new HashMap(); + Map map=new HashMap<>(); SysUser sysUser = sysUserService.getById(userId); String username = sysUser.getUsername(); Integer identity = sysUser.getUserIdentity(); @@ -1226,8 +1275,8 @@ public class SysUserController { */ @GetMapping("/appQueryByDepartId") public Result> appQueryByDepartId(@RequestParam(name="departId", required = false) String departId) { - Result> result = new Result>(); - List list=new ArrayList (); + Result> result = new Result<>(); + List list=new ArrayList<> (); list.add(departId); List childrenUser = sysUserService.queryByDepIds(list,null); result.setResult(childrenUser); @@ -1240,8 +1289,8 @@ public class SysUserController { */ @GetMapping("/appQueryUser") public Result> appQueryUser(@RequestParam(name = "keyword", required = false) String keyword) { - Result> result = new Result>(); - LambdaQueryWrapper queryWrapper =new LambdaQueryWrapper(); + Result> result = new Result<>(); + LambdaQueryWrapper queryWrapper =new LambdaQueryWrapper<>(); //TODO 外部模拟登陆临时账号，列表不显示 queryWrapper.ne(SysUser::getUsername,"_reserve_user_external"); if(StringUtils.isNotBlank(keyword)){ @@ -1252,11 +1301,9 @@ public class SysUserController { //step.1 先拿到全部的 useids //step.2 通过 useids，一次性查询用户的所属部门名字 List userIds = list.stream().map(SysUser::getId).collect(Collectors.toList()); - if(userIds!=null && userIds.size()>0){ + if(userIds!=null && !userIds.isEmpty()){ Map useDepNames = sysUserService.getDepNamesByUserIds(userIds); - list.forEach(item->{ - item.setOrgCodeTxt(useDepNames.get(item.getId())); - }); + list.forEach(item-> item.setOrgCodeTxt(useDepNames.get(item.getId()))); } result.setResult(list); return result; @@ -1267,11 +1314,12 @@ public class SysUserController { * @param json * @return */ - @RequestMapping(value = "/updateMobile", method = RequestMethod.PUT) - public Result changMobile(@RequestBody JSONObject json,HttpServletRequest request) { - String smscode = json.getString("smscode"); - String phone = json.getString("phone"); - Result result = new Result(); +// @RequestMapping(value = "/updateMobile", method = RequestMethod.PUT) + @PutMapping("/updateMobile") + public Result changMobile(@RequestBody JSONObject json,HttpServletRequest request) { + String smscode = json.getString(SMSCODE); + String phone = json.getString(PHONE); + Result result = new Result<>(); //获取登录用户名 String username = JwtUtil.getUserNameByToken(request); if(oConvertUtils.isEmpty(username) || oConvertUtils.isEmpty(smscode) || oConvertUtils.isEmpty(phone)) { @@ -1292,13 +1340,13 @@ public class SysUserController { } SysUser user = sysUserService.getUserByName(username); if(user==null) { - return Result.error("用户不存在！"); + return Result.error(USER_ERROR_MSG); } user.setPhone(phone); sysUserService.updateById(user); return Result.OK("手机号设置成功!"); } - + /** * 根据对象里面的属性值作in查询 属性可能会变 用户组件用到 * @param sysUser @@ -1325,20 +1373,20 @@ public class SysUserController { SysUser sysUser = sysUserService.getById(id); baseCommonService.addLog("编辑用户角色，id： " + id, CommonConstant.LOG_TYPE_2, 2); if (sysUser == null) { - return Result.error("未找到对应实体"); + return Result.error(INEXISTENCE); } else { SysUser user = new SysUser(); user.setId(id); user.setUpdateTime(new Date()); - String roles = jsonObject.getString("selectedroles"); + String roles = jsonObject.getString(SELECTED_ROLES); sysUserService.addRoleToUser(user, roles); return Result.OK("修改成功!"); } } } catch (Exception e) { - log.error(e.getMessage(), e); + SysUserController.log.error(e.getMessage(), e); return Result.error("操作失败"); } return Result.OK("修改成功!"); diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysUserService.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysUserService.java index 91855988..c78f2d80 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysUserService.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysUserService.java @@ -16,6 +16,7 @@ import com.jero.modules.system.entity.SysUser; import com.baomidou.mybatisplus.extension.service.IService; import com.jero.modules.system.model.SysUserSysDepartModel; +import org.apache.poi.ss.formula.functions.T; import org.springframework.transaction.annotation.Transactional; /** @@ -45,7 +46,7 @@ public interface ISysUserService extends IService { * @param confirmpassword * @return */ - public Result resetPassword(String username, String oldpassword, String newpassword, String confirmpassword); + public Result resetPassword(String username, String oldpassword, String newpassword, String confirmpassword); /** * 修改密码 @@ -53,7 +54,7 @@ public interface ISysUserService extends IService { * @param sysUser * @return */ - public Result changePassword(SysUser sysUser); + public Result changePassword(SysUser sysUser); /** * 删除用户 @@ -68,17 +69,17 @@ public interface ISysUserService extends IService { * @return */ public boolean deleteBatchUsers(String userIds); - + public SysUser getUserByName(String username); - + /** * 添加用户和用户角色关系 * @param user * @param roles */ public void addUserWithRole(SysUser user,String roles); - - + + /** * 修改用户和用户角色关系 * @param user @@ -99,7 +100,7 @@ public interface ISysUserService extends IService { * @return */ public List getRole(String username); - + /** * 查询用户信息包括 部门信息 * @param username @@ -177,14 +178,14 @@ public interface ISysUserService extends IService { * @return 权限集合 */ Set getUserPermissionsSet(String username); - + /** * 根据用户名设置部门ID * @param username * @param orgCode */ void updateUserDepart(String username,String orgCode); - + /** * 根据手机号获取用户名和密码 */ @@ -210,7 +211,7 @@ public interface ISysUserService extends IService { * @param departs */ void editUserWithDepart(SysUser user, String departs); - + /** * 校验用户是否有效 * @param sysUser @@ -256,7 +257,7 @@ public interface ISysUserService extends IService { * @return */ List queryByDepIds(List departIds, String username); - + /** * 保存用户 * @param user 用户 diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java index a96f6ca7..d9cc6437 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java @@ -22,6 +22,7 @@ import com.jero.modules.system.mapper.*; import com.jero.modules.system.model.SysUserSysDepartModel; import com.jero.modules.system.service.ISysUserService; import com.jero.modules.system.vo.SysUserDepNameVo; +import org.apache.poi.ss.formula.functions.T; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.annotation.CacheEvict; import org.springframework.stereotype.Service; @@ -42,7 +43,7 @@ import java.util.stream.Collectors; @Service @Slf4j public class SysUserServiceImpl extends ServiceImpl implements ISysUserService { - + @Autowired private SysUserMapper userMapper; @Autowired @@ -67,7 +68,7 @@ public class SysUserServiceImpl extends ServiceImpl impl @Override @CacheEvict(value = {CacheConstant.SYS_USERS_CACHE}, allEntries = true) - public Result resetPassword(String username, String oldpassword, String newpassword, String confirmpassword) { + public Result resetPassword(String username, String oldpassword, String newpassword, String confirmpassword) { SysUser user = userMapper.getUserByName(username); String passwordEncode = PasswordUtil.encrypt(username, oldpassword, user.getSalt()); if (!user.getPassword().equals(passwordEncode)) { @@ -86,7 +87,7 @@ public class SysUserServiceImpl extends ServiceImpl impl @Override @CacheEvict(value = {CacheConstant.SYS_USERS_CACHE}, allEntries = true) - public Result changePassword(SysUser sysUser) { + public Result changePassword(SysUser sysUser) { String salt = oConvertUtils.randomGen(8); sysUser.setSalt(salt); String password = sysUser.getPassword(); @@ -118,8 +119,8 @@ public class SysUserServiceImpl extends ServiceImpl impl public SysUser getUserByName(String username) { return userMapper.getUserByName(username); } - - + + @Override @Transactional public void addUserWithRole(SysUser user, String roles) { @@ -168,7 +169,7 @@ public class SysUserServiceImpl extends ServiceImpl impl public List getRole(String username) { return sysUserRoleMapper.getRoleByUserName(username); } - + /** * 通过用户名获取用户角色集合 * @param username 用户名 @@ -212,7 +213,7 @@ public class SysUserServiceImpl extends ServiceImpl impl info.setSysUserName(user.getRealname()); info.setSysOrgCode(user.getOrgCode()); } - + //多部门支持in查询 List list = sysDepartMapper.queryUserDeparts(user.getId()); List sysMultiOrgCode = new ArrayList(); @@ -228,7 +229,7 @@ public class SysUserServiceImpl extends ServiceImpl impl } } info.setSysMultiOrgCode(sysMultiOrgCode); - + return info; }