fix: 部门修改状态

wl

2022-12-12 c555c3d20cfc020bf9cece3146ea32bcc59950f1

 ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java

@@ -137,7 +137,7 @@
            }
            umsRoleMenuRelations
                    .stream()
                    .map(item->item.getMenuId())
                    .map(item -> item.getMenuId())
                    .collect(Collectors.toList())
                    .stream()
                    .distinct()
@@ -297,15 +297,16 @@
            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]{6,16}$")) {
            return -1;
        }
        QueryWrapper<UmsAdmin> wrapper = new QueryWrapper<>();
@@ -359,16 +360,16 @@
            queryWrapper.eq(UmsAdmin::getUserType, pageUserVO.getUserType());
        }*/
        UmsAdmin umsAdmin = new UmsAdmin();
        if (pageUserVO.getUserType()!=null) {
           umsAdmin.setUserType(pageUserVO.getUserType());
        if (pageUserVO.getUserType() != null) {
            umsAdmin.setUserType(pageUserVO.getUserType());
        }
        if (pageUserVO.getKeyword()!=null&&!("".equals(pageUserVO.getKeyword()))) {
          umsAdmin.setKeyword(pageUserVO.getKeyword());
        if (pageUserVO.getKeyword() != null && !("".equals(pageUserVO.getKeyword()))) {
            umsAdmin.setKeyword(pageUserVO.getKeyword());
        }
        if (pageUserVO.getJobTitle()!=null&&!("".equals(pageUserVO.getJobTitle()))) {
        if (pageUserVO.getJobTitle() != null && !("".equals(pageUserVO.getJobTitle()))) {
            umsAdmin.setJobTitle(pageUserVO.getJobTitle());
        }
        Page<UmsAdmin> page1 = baseMapper.selectCondPage(page,umsAdmin);
        Page<UmsAdmin> page1 = baseMapper.selectCondPage(page, umsAdmin);

        return page1;
    }