| | |
| | | if (userInfo != null && userInfo.getUser() != null) { |
| | | bladeLogger.info("用户信息修改", user.toString()); |
| | | user.setId(userInfo.getUser().getId()); |
| | | user.setDeptId(userInfo.getUser().getDeptId()); |
| | | user.setRoleId(userInfo.getUser().getRoleId()); |
| | | user.setDeptId(StringUtil.isBlank(user.getDeptId()) ? userInfo.getUser().getDeptId() : user.getDeptId()); |
| | | user.setRoleId(StringUtil.isBlank(user.getRoleId()) ? userInfo.getUser().getRoleId() : user.getRoleId()); |
| | | user.setIsDeleted(user.getIsDeleted()); |
| | | isRet = userService.updateUser(user); |
| | | } else { |
| | | // 将String类型的deptId转换为Long类型 |
| | |
| | | Dept dept = deptService.getById(deptIdLong); |
| | | user.setAreaCode(HeaderUtils.processAreaCode(dept.getAreaCode())); |
| | | user.setPassword(DigestUtil.encrypt("jadk@2026")); |
| | | user.setDeptId(user.getDeptId() == null ? String.valueOf(dept.getId()) : user.getDeptId()); |
| | | user.setRoleId(user.getRoleId() == null ? "2011678430358691842" : user.getRoleId()); |
| | | isRet = userService.save(user); |
| | | user.setDeptId(StringUtil.isBlank(user.getDeptId()) ? String.valueOf(dept.getId()) : user.getDeptId()); |
| | | user.setRoleId(StringUtil.isBlank(user.getRoleId()) ? "2011678430358691842" : user.getRoleId()); |
| | | user.setCreateTime(new Date()); |
| | | isRet = userService.submitNotPassword(user); |
| | | bladeLogger.info("用户信息新增", user.toString()); |
| | | } |
| | | |
| | | return R.status(isRet); |
| | | } |
| | | |
| | | public static void main(String[] args) { |
| | | String encrypt = DigestUtil.encrypt("jadk@2026"); |
| | | System.out.println(encrypt); |
| | | } |
| | | |
| | | } |