From 12e26ef1e17daa151cf53ad60705d9bbbddeb168 Mon Sep 17 00:00:00 2001 From: wl <173@qq.com> Date: 星期四, 29 十二月 2022 14:59:41 +0800 Subject: [PATCH] fix: 获取部门树为启用的 --- ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java | 38 +++++++++++++++++++++++++++++--------- 1 files changed, 29 insertions(+), 9 deletions(-) diff --git a/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java b/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java index 7664f29..22227c3 100644 --- a/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java +++ b/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java @@ -4,7 +4,6 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ycl.bo.AdminUserDetails; @@ -113,6 +112,13 @@ } //灏嗗瘑鐮佽繘琛屽姞瀵嗘搷浣� String encodePassword = passwordEncoder.encode(umsAdmin.getPassword()); + + if ( !umsAdmin.getPassword().matches("^(?=.*\\d)(?=.*[a-z])(?=.*[A-Z])[a-zA-Z0-9]{8,16}$")) { + Asserts.fail("瀵嗙爜闀垮害8鍒�16浣嶄笖瀵嗙爜涓殑瀛楃蹇呴』鍖呭惈瀛楁瘝锛堝ぇ鍐欐垨鑰呭皬鍐欙級鍜屽繀椤诲寘鍚暟瀛楋紝涓嶈兘鍖呭惈绌烘牸"); + } + if(umsAdmin.getUsername().equals(umsAdmin.getPassword())){ + Asserts.fail("瀵嗙爜涓嶈兘鍜岀櫥褰曞悕瀹屽叏涓�鑷�"); + } umsAdmin.setPassword(encodePassword); baseMapper.insert(umsAdmin); @@ -138,7 +144,7 @@ } umsRoleMenuRelations .stream() - .map(item->item.getMenuId()) + .map(item -> item.getMenuId()) .collect(Collectors.toList()) .stream() .distinct() @@ -183,7 +189,7 @@ token = jwtTokenUtil.generateToken(userDetails.getUserId(), userDetails.getUsername()); redisService.set(RedisKey.PLATFORM_TOKEN_KEY.concat(username), token, LiveTimeMillisecond.s7200.time); // updateLoginTimeByUsername(username); - insertLoginLog(username); + //insertLoginLog(username); } catch (AuthenticationException e) { LOGGER.warn("鐧诲綍寮傚父:{}", e.getMessage()); } @@ -298,16 +304,20 @@ return umsMenuList; } umsMenuList = umsMenuMapper.getMenuList(adminId); - getCacheService().setResourceList(adminId, umsMenuList); + getCacheService().setResourceList(adminId, umsMenuList); return umsMenuList; } @Override public int updatePassword(UpdateAdminPasswordParam param) { - if (StrUtil.isEmpty(param.getUsername()) - || StrUtil.isEmpty(param.getOldPassword()) - || StrUtil.isEmpty(param.getNewPassword())) { + if (StrUtil.isNotEmpty(param.getUsername()) + && StrUtil.isNotEmpty(param.getOldPassword()) + && StrUtil.isNotEmpty(param.getNewPassword()) + && !param.getNewPassword().matches("^(?=.*\\d)(?=.*[a-z])(?=.*[A-Z])[a-zA-Z0-9]{8,16}$")) { return -1; + } + if(param.getUsername().equals(param.getNewPassword())){ + return -4; } QueryWrapper<UmsAdmin> wrapper = new QueryWrapper<>(); wrapper.lambda().eq(UmsAdmin::getUsername, param.getUsername()); @@ -342,7 +352,7 @@ } @Override - public IPage<UmsAdmin> pageUser(UserVO.PageUserVO pageUserVO) { + public Page<UmsAdmin> pageUser(UserVO.PageUserVO pageUserVO) { int pageSize = pageUserVO.getPageSize(); int current = pageUserVO.getCurrent(); Page<UmsAdmin> page = new Page<>(current, pageSize); @@ -359,7 +369,17 @@ if (PojoUtils.Vo.isUsefulSearchParam(pageUserVO.getUserType())) { queryWrapper.eq(UmsAdmin::getUserType, pageUserVO.getUserType()); }*/ - Page<UmsAdmin> page1 = baseMapper.selectCondPage(page,pageUserVO); + UmsAdmin umsAdmin = new UmsAdmin(); + if (pageUserVO.getUserType() != null) { + umsAdmin.setUserType(pageUserVO.getUserType()); + } + if (pageUserVO.getKeyword() != null && !("".equals(pageUserVO.getKeyword()))) { + umsAdmin.setKeyword(pageUserVO.getKeyword()); + } + if (pageUserVO.getJobTitle() != null && !("".equals(pageUserVO.getJobTitle()))) { + umsAdmin.setJobTitle(pageUserVO.getJobTitle()); + } + Page<UmsAdmin> page1 = baseMapper.selectCondPage(page, umsAdmin); return page1; } -- Gitblit v1.8.0