diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/base/ISysUserService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/base/ISysUserService.java index 423c1df..d909eb2 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/base/ISysUserService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/base/ISysUserService.java @@ -89,6 +89,13 @@ public interface ISysUserService { SysUser getSysUserById(String id); /** + * 获取用户详细信息 + * @param id + * @return + */ + SysUserInfo getSysUserInfoById(String id); + + /** * 根据登录名称 获取用户信息 * @param loginName * @return diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/AuthController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/AuthController.java index 5197e0b..38b869e 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/AuthController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/AuthController.java @@ -6,6 +6,7 @@ import cn.estsh.i3plus.core.apiservice.controller.DemoAuthController; import cn.estsh.i3plus.pojo.platform.bean.SessionUser; import cn.estsh.impp.framework.boot.auth.AuthUtil; import cn.estsh.impp.framework.boot.exception.ImppBusiException; +import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; import cn.estsh.impp.framework.boot.util.ImppRedis; import cn.estsh.impp.framework.boot.util.ResultBean; import io.swagger.annotations.Api; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; /** * @Description : 用户权限服务 @@ -42,15 +44,19 @@ public class AuthController { @GetMapping(value="/login") @ApiOperation(value="登陆",notes="登陆") - public ResultBean login(String loginName, String loginPwd, String languageCode){ + public ResultBean login(HttpServletRequest request, String loginName, String loginPwd, String languageCode){ LOGGER.info("用户登陆 loginName:{} loginPwd:{} languageCode:{}",loginName,loginPwd,languageCode); try { - SessionUser sUser = userService.queryUserLogin(loginName,loginPwd,languageCode); - LOGGER.info("会员登陆：{}",sUser); + SessionUser user = userService.queryUserLogin(loginName,loginPwd,languageCode); + LOGGER.info("会员登陆：{}",user); AuthUtil.setSessionObject("languageCode",languageCode); - return new ResultBean(true,""); + String sessionId = request.getSession().getId(); + String token = "{accessToken:'"+sessionId+"',expiresIn:1800}"; + return new ResultBean(true,"",token); } catch (ImppBusiException e) { return new ResultBean(false,e.getErrorDetail() + ",so:" + e.getErrorSolution()); + }catch (Exception e){ + return ResultBean.fail(e.getMessage()).setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode()); } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/OrganizeController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/OrganizeController.java index 1603b77..23a195b 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/OrganizeController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/OrganizeController.java @@ -80,9 +80,9 @@ public class OrganizeController { } } - @DeleteMapping(value = "/delete") + @DeleteMapping(value = "/delete/{id}") @ApiOperation(value = "删除组织", notes = "删除组织") - public ResultBean deleteOrganize(String id) { + public ResultBean deleteOrganize(@PathVariable("id") String id) { try { // 数据校验 ValidatorBean.checkNotNull(id, "组织id 不能为空"); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMenuController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMenuController.java index 164362c..648fc60 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMenuController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMenuController.java @@ -79,9 +79,9 @@ public class SysMenuController { } } - @DeleteMapping(value = "/delete") + @DeleteMapping(value = "/delete/{id}") @ApiOperation(value = "删除系统功能", notes = "删除系统功能") - public ResultBean deleteSysMenu(String id) { + public ResultBean deleteSysMenu(@PathVariable("id") String id) { try { // 数据校验 ValidatorBean.checkNotNull(id, "系统功能id 不能为空"); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysRoleController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysRoleController.java index 2ed1c30..be6648a 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysRoleController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysRoleController.java @@ -80,9 +80,9 @@ public class SysRoleController { } } - @DeleteMapping(value = "/delete") + @DeleteMapping(value = "/delete/{id}") @ApiOperation(value = "删除系统角色", notes = "删除系统角色") - public ResultBean deleteSysRole(String id) { + public ResultBean deleteSysRole(@PathVariable("id") String id) { try { // 数据校验 ValidatorBean.checkNotNull(id, "角色id 不能为空"); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java index 214c0bc..a113226 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java @@ -5,6 +5,7 @@ import cn.estsh.i3plus.platform.common.convert.ConvertBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; import cn.estsh.i3plus.pojo.platform.bean.SysUser; +import cn.estsh.i3plus.pojo.platform.bean.SysUserInfo; import cn.estsh.impp.framework.boot.auth.AuthUtil; import cn.estsh.impp.framework.boot.exception.ImppBusiException; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; @@ -28,7 +29,7 @@ import java.util.List; * @Modify : **/ @RestController -@RequestMapping("/user") +@RequestMapping("/sys-user") @Api(description = "系统用户服务") public class SysUserController { @@ -61,6 +62,9 @@ public class SysUserController { //新增初始化 ConvertBean.modelInitialize(sysUser, AuthUtil.getSessionUser()); + sysUser.setUserStatus(CommonEnumUtil.USER_STATUS.NORMAL.getValue()); + sysUser.setUserTypeId(CommonEnumUtil.USER_TYPE.USER.getValue()); + SysUser user = sysUserService.insertSysUser(sysUser); // 更新用户关系 @@ -105,7 +109,12 @@ public class SysUserController { .build(); } + // 用户信息封装 + SysUserInfo userInfo = sysUserService.getSysUserInfoById(sysUser.getId().toString()); + sysUser.setUserInfo(userInfo); ConvertBean.modelUpdate(sysUser, AuthUtil.getSessionUser()); + ConvertBean.modelUpdate(userInfo, AuthUtil.getSessionUser()); + // 更新用户关系 sysUserService.refreshRefUserDepartment(sysUser,departmentId,AuthUtil.getSessionUser()); sysUserService.refreshRefUserPosition(sysUser,positionId,AuthUtil.getSessionUser()); @@ -161,6 +170,23 @@ public class SysUserController { } } + @PutMapping(value = "/status") + @ApiOperation(value = "修改用户状态", notes = "根据ID修改用户状态") + public ResultBean updateStatus(String id, int status) { + try { + // 数据校验 + ValidatorBean.checkNotNull(id, "用户id 不能为空"); + ValidatorBean.checkNotZero(status, "用户状态不能为空"); + sysUserService.updateSysUserStatus(id, status, AuthUtil.getSessionUser()); + return new ResultBean(true); + } catch (ImppBusiException busExcep) { + LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep); + return ResultBean.fail(busExcep.getErrorShow()); + } catch (Exception e) { + LOGGER.error(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getDescription() + "：{}", e.getMessage(), e); + return ResultBean.fail().setCode(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getCode()); + } + } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/TaskTimeController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/TaskTimeController.java index b0fcf86..63a86ee 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/TaskTimeController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/TaskTimeController.java @@ -107,9 +107,9 @@ public class TaskTimeController { } } - @DeleteMapping(value = "/delete") + @DeleteMapping(value = "/delete/{id}") @ApiOperation(value = "删除定时任务", notes = "删除定时任务") - public ResultBean deleteTaskTime(String id) { + public ResultBean deleteTaskTime(@PathVariable("id") String id) { try { // 数据校验 ValidatorBean.checkNotNull(id, "定时任务id 不能为空"); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemLoginService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemLoginService.java index 0749cb1..00e4f8a 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemLoginService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemLoginService.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.core.apiservice.serviceimpl.base; import cn.estsh.i3plus.core.api.iservice.base.ISystemLoginService; +import cn.estsh.i3plus.platform.common.tool.EncryptTool; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.shirotoken.AdminToken; import cn.estsh.i3plus.pojo.base.shirotoken.SaAdminToken; @@ -11,6 +12,7 @@ import cn.estsh.i3plus.pojo.platform.repository.SysUserRepository; import cn.estsh.impp.framework.boot.auth.AuthUtil; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -82,25 +84,25 @@ public class SystemLoginService implements ISystemLoginService { * @param pwd * @return */ - public SysUser getUserLoginInfo(String loginName,String pwd){ + public SysUser getUserLoginInfo(String loginName,String pwd) { SysUser user = sysUserRDao.getByProperty("userLoginName",loginName); - if(user == null){ - //用户不存在 + + try { // 密码加密 + pwd = EncryptTool.hexMD5(pwd); + }catch (Exception e){ + e.printStackTrace(); + } + + if(user == null){ //用户不存在 throw ImppExceptionBuilder.newInstance() .setSystemID(CommonEnumUtil.SOFT_TYPE.IMPP.getCode()) .setErrorCode(ImppExceptionEnum.LOGIN_EXCEPTION.getCode()) .setErrorDetail("用户不存在") .setErrorSolution("重新登陆") .build(); -// }else if(!StringUtils.equals(user.getLoginPwd(),pwd)){ -// //密码不符 -// throw ImppExceptionBuilder.newInstance() -// .setSystemID(CommonEnumUtil.SOFT_TYPE.IMPP.getCode()) -// .setErrorCode(ImppExceptionEnum.LOGIN_EXCEPTION.getCode()) -// .setErrorDetail("登陆密码错误") -// .setErrorSolution("重新输入") -// .build(); - }else if(!"123".equals(pwd)){ + } + + if (!StringUtils.equals(user.getUserLoginPassword(),pwd )) { //密码不符 throw ImppExceptionBuilder.newInstance() .setSystemID(CommonEnumUtil.SOFT_TYPE.IMPP.getCode()) .setErrorCode(ImppExceptionEnum.LOGIN_EXCEPTION.getCode()) @@ -108,7 +110,6 @@ public class SystemLoginService implements ISystemLoginService { .setErrorSolution("重新输入") .build(); } - return user; } @@ -123,9 +124,9 @@ public class SystemLoginService implements ISystemLoginService { SessionUser sessionUser = new SessionUser(); sessionUser.setLanguageCode(languageCode); // sessionUser.setSiteCode(user.getFactoryCode()); - sessionUser.setUserName(user.getName()); +// sessionUser.setUserName(user.getName()); sessionUser.setUserType(userType); - sessionUser.setUserCode(user.getUserInfo().getLanguageCode()); +// sessionUser.setUserCode(user.getUserInfo().getLanguageCode()); return sessionUser; } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/OrganizeServiceImpl.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/OrganizeServiceImpl.java index 01d4117..d7e4cc2 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/OrganizeServiceImpl.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/OrganizeServiceImpl.java @@ -8,6 +8,8 @@ import cn.estsh.i3plus.pojo.platform.bean.SessionUser; import cn.estsh.i3plus.pojo.platform.repository.OrganizeRepository; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; +import cn.estsh.impp.framework.boot.util.ValidatorBean; +import org.aspectj.weaver.ast.Or; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -33,6 +35,14 @@ public class OrganizeServiceImpl implements IOrganizeService { @Override public void updateOrganize(Organize organize) { LOGGER.info("组织 ORGANIZE :{}", organize); + + if(organize.getParentId() != null){ + Organize org = getOrganizeById(organize.getParentId().toString()); + ValidatorBean.checkNotNull(org); + + organize.setRedParentName(org.getName()); + } + organizeRDao.update(organize); } @@ -64,6 +74,13 @@ public class OrganizeServiceImpl implements IOrganizeService { @Override public Organize insertOrganize(Organize organize) { LOGGER.info("组织 ORGANIZE :{}", organize); + + if(organize.getParentId() != null){ + Organize org = getOrganizeById(organize.getParentId().toString()); + ValidatorBean.checkNotNull(org); + + organize.setRedParentName(org.getName()); + } return organizeRDao.insert(organize); } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserServiceImpl.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserServiceImpl.java index 3b908cb..152bbcc 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserServiceImpl.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserServiceImpl.java @@ -70,27 +70,10 @@ public class SysUserServiceImpl implements ISysUserService { @Override public SessionUser queryUserLogin(String loginName, String password, String languageCode) { LOGGER.info("平台用户 SYS_USER loginName:{} \t password:{} \t languageCode:{}", loginName, password, languageCode); - SysUser user = getSysUserByLoginName(loginName); - AuthenticationToken token = null; - if (user == null) { - //用户不存在 - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.IMPP.getCode()) - .setErrorCode(ImppExceptionEnum.LOGIN_EXCEPTION.getCode()) - .setErrorDetail("用户不存在") - .setErrorSolution("重新登陆") - .build(); - } else if (!StringUtils.equals(user.getUserLoginPassword(), password)) { - //密码不符 - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.IMPP.getCode()) - .setErrorCode(ImppExceptionEnum.LOGIN_EXCEPTION.getCode()) - .setErrorDetail("登陆密码错误") - .setErrorSolution("重新输入") - .build(); - } + SysUser user = getSysUserByLoginName(loginName); + AuthenticationToken token = null; switch (user.getUserTypeId()) { case 2: token = new AdminToken(loginName, password, languageCode); @@ -120,86 +103,6 @@ public class SysUserServiceImpl implements ISysUserService { sysUserRDao.update(sysUser); } -// @Override -// public SysUser updateSysUserModel(UserModel model, SessionUser user) { -// LOGGER.info("平台用户 SYS_USER model:{}", model); -// LOGGER.info("平台用户 SYS_USER user:{}", user); -// -// // 数据真实性校验 -// SysRole sysRole = sysRoleRDao.getById(model.getRole().id); -// checkSysRole(sysRole); -// -// Department dep = departmentRDao.getById(model.getDepartment().getId()); -// checkDepartment(dep); -// -// Position pos = positionRDao.getById(model.getPosition().getId()); -// checkPosition(pos); -// -// Organize organize = organizeRDao.getById(model.getDepartment().getOrganizeId()); -// checkOrganize(organize); -// -// SysUser sysUser = model.getUser(); -// -// //TODO UserLoginName Count -// SysUser loginUser = getSysUserByLoginName(sysUser.getUserLoginName()); -// // 判断是否修改登录名称 -// if (loginUser == null || loginUser.getId().equals(sysUser.getId())) { -// // 冗余部分信息 -// sysUser.setRedDepartmentName(dep.getDepartmentName()); -// sysUser.setRedRoleName(sysRole.getName()); -// sysUser.setRedPositionName(pos.getPositionName()); -// sysUser.setOrganizeId(organize.getId()); -// sysUser.setRedOrganizeName(organize.getRedParentName()); -// -// if (!sysUser.getUserLoginPassword().isEmpty()) { -// //TODO 密码加密 -// } -// -// // 刷新用户角色关系信息 -// refreshRefUserRole(model, sysUser); -// -// // 刷新用户部门关系信息 -// refreshRefUserDepartment(model, sysUser); -// -// // 刷新用户岗位关系信息 -// refreshRefUserPosition(model, sysUser); -// -// // 保存用户信息 -// sysUserInfoRDao.save(model.getUserInfo()); -// return sysUserRDao.save(sysUser); -// } else { -// throw ImppExceptionBuilder.newInstance() -// .setSystemID(CommonEnumUtil.SOFT_TYPE.IMPP.getCode()) -// .setErrorCode(ImppExceptionEnum.IO_EXCEPTION.getCode()) -// .setErrorDetail("用户名已存在") -// .setErrorSolution("请重新输入用户名") -// .build(); -// } -// } -// -// @Override -// public SysUser insertSysUserModel(UserModel model, SessionUser user) { -// LOGGER.info("平台用户 SYS_USER model:{}", model); -// LOGGER.info("平台用户 SYS_USER user:{}", user); -// -// SysUser sysUser = model.getUser(); -// SysUser loginUser = getSysUserByLoginName(sysUser.getUserLoginName()); -// if (null == loginUser) { -// sysUser = sysUserRDao.insert(sysUser); -// model.getUserInfo().setUserId(sysUser.getId()); -// model.setUser(sysUser); -// return updateSysUserModel(model, user); -// } else { -// throw ImppExceptionBuilder.newInstance() -// .setSystemID(CommonEnumUtil.SOFT_TYPE.IMPP.getCode()) -// .setErrorCode(ImppExceptionEnum.IO_EXCEPTION.getCode()) -// .setErrorDetail("用户名已存在") -// .setErrorSolution("请重新输入用户名") -// .build(); -// } -// } - - @Override public void updateSysUser(SysUser sysUser) throws Exception{ LOGGER.info("平台用户 SYS_USER SysUser :{}", sysUser); @@ -233,12 +136,8 @@ public class SysUserServiceImpl implements ISysUserService { SysUser loginUser = getSysUserByLoginName(sysUser.getUserLoginName()); if (null == loginUser) { // 密码加密 输入的密码不等于密码一致时修改密码 - if(!sysUser.getUserLoginPassword().isEmpty()){ - if(sysUser.getUserLoginPassword().equals(loginUser.getUserLoginPassword())){ - String md5 = EncryptTool.hexMD5(sysUser.getUserLoginPassword()); - sysUser.setUserLoginPassword(md5); - } - } + String md5 = EncryptTool.hexMD5(sysUser.getUserLoginPassword()); + sysUser.setUserLoginPassword(md5); SysUser user = sysUserRDao.insert(sysUser); @@ -275,9 +174,11 @@ public class SysUserServiceImpl implements ISysUserService { RefUserDepartment refUserDepartment = new RefUserDepartment(sysUser.getId(), dep.getId(), dep.getDepartmentName()); refUserDepartmentRDao.save(refUserDepartment); + // 组织信息冗余 Organize organize = organizeRDao.getById(dep.getOrganizeId()); if(organize != null){ sysUser.setRedOrganizeName(organize.getName()); + sysUser.setOrganizeId(organize.getId()); } // 冗余 部门信息 @@ -299,10 +200,11 @@ public class SysUserServiceImpl implements ISysUserService { // 删除角色关系信息 refUserRoleRDao.deleteByProperties("userId", sysUser.getId()); // 删除用户角色关系 - // 新增用户角色关系 if(null != list && list.size() > 0){ + // 新增用户角色关系 List refUserRoles = new ArrayList<>(); List roleNameList = new ArrayList<>(); + SysRole sysRole = list.get(0); RefUserRole refUserRole = null; for (SysRole role : list) { roleNameList.add(role.getName()); @@ -311,8 +213,11 @@ public class SysUserServiceImpl implements ISysUserService { refUserRoles.add(refUserRole); } refUserRoleRDao.saveAll(refUserRoles); + // 角色名称冗余 sysUser.getUserInfo().setRedRoleNames(String.join(",", roleNameList)); + sysUser.setRoleId(sysRole.getId()); + sysUser.setRedRoleName(sysRole.getName()); } } @@ -332,6 +237,7 @@ public class SysUserServiceImpl implements ISysUserService { // 岗位名称冗余 sysUser.getUserInfo().setRedPositionNames(pos.getName()); + sysUser.setRedPositionName(pos.getName()); } @Override @@ -358,6 +264,12 @@ public class SysUserServiceImpl implements ISysUserService { } @Override + public SysUserInfo getSysUserInfoById(String id) { + LOGGER.info("平台用户明细 SYS_USER_INFO get By id :{}", id); + return sysUserInfoRDao.getByProperty("userId",Long.parseLong(id)); + } + + @Override public SysUser getSysUserByLoginName(String loginName) { LOGGER.info("平台用户 SYS_USER find By Login Name :{}", loginName); return sysUserRDao.getByProperty(new String[]{"userLoginName", "isValid"},