diff --git a/README.md b/README.md index ca46b0bd8..87399bdc2 100644 --- a/README.md +++ b/README.md @@ -155,6 +155,9 @@ JeecgBoot平台提供了一套完善的AI应用管理系统模块，是一套类 #### 前端 - 前端环境要求：Node.js要求`Node 20+` 版本以上、pnpm 要求`9+` 版本以上 + +> Vite 不再支持已结束生命周期（EOL）的 Node.js 18。现在需要使用 Node.js 20.19+ 或 22.12+。 + - 依赖管理：node、npm、pnpm - 前端IDE建议：IDEA、WebStorm、Vscode - 采用 Vue3.0+TypeScript+Vite6+Ant-Design-Vue4等新技术方案，包括二次封装组件、utils、hooks、动态菜单、权限校验、按钮级别权限控制等功能 diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java index 61b6c2ab9..fd46a40b3 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java @@ -2055,7 +2055,10 @@ public class SysBaseApiImpl implements ISysBaseAPI { if(oConvertUtils.isEmpty(code)) { return null; } - List list = sysDepartList.stream().filter(sysDepart -> sysDepart.getOrgCode().equals(code)).toList(); + List list = sysDepartList.stream() + .filter(sysDepart -> sysDepart.getOrgCode().equals(code)) + .collect(Collectors.toList()); + //判断去上级的级别 if(!CollectionUtils.isEmpty(list) && nowLevel == level) { return list.get(0); diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java index 7802c6b06..46389c9f8 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java @@ -785,7 +785,7 @@ public class SysDepartServiceImpl extends ServiceImpl departIdList = new ArrayList<>(); //如果前端传过来的部门id不为空的时候，说明是系统用户根据所属部门选择主岗位或者兼职岗位 if(oConvertUtils.isNotEmpty(departIds) && oConvertUtils.isEmpty(parentId)){ - departIdList = list.stream().map(SysDepart::getId).toList(); + departIdList = list.stream().map(SysDepart::getId).collect(Collectors.toList()); } List records = new ArrayList<>(); for (int i = 0; i < list.size(); i++) { @@ -1859,7 +1859,7 @@ public class SysDepartServiceImpl extends ServiceImpl sysDepartList = departMapper.selectList(query); if(!CollectionUtils.isEmpty(sysDepartList)){ //获取部门名称拼接返回给前台 - List departNameList = sysDepartList.stream().map(SysDepart::getDepartName).toList(); + List departNameList = sysDepartList.stream().map(SysDepart::getDepartName).collect(Collectors.toList()); String departNames = String.join("/", departNameList); redisUtil.set(CommonConstant.DEPART_NAME_REDIS_KEY_PRE + orgCode,departNames); return departNames; diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysTenantPackServiceImpl.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysTenantPackServiceImpl.java index b3c09c4e4..ea77de44a 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysTenantPackServiceImpl.java +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysTenantPackServiceImpl.java @@ -100,11 +100,11 @@ public class SysTenantPackServiceImpl extends ServiceImpl existingUserIds = existingUsers.stream() .map(SysTenantPackUser::getUserId) - .toList(); + .collect(Collectors.toList()); // 过滤出需要新增的用户ID List newUserIds = userIds.stream() .filter(userId -> !existingUserIds.contains(userId)) - .toList(); + .collect(Collectors.toList()); for (String userId : newUserIds) { //update-end---author:wangshuai---date:2025-09-03---for: 编辑时需要查看有没有未分配的用户--- SysTenantPackUser tenantPackUser = new SysTenantPackUser(tenantId, packId, userId); diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java index 4b3e62412..bad33c4f4 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java @@ -2734,7 +2734,7 @@ public class SysUserServiceImpl extends ServiceImpl impl public IPage queryDepartPostUserByOrgCode(String orgCode, SysUser userParams, IPage page) { List sysDepartModels = baseMapper.queryDepartPostUserByOrgCode(page, orgCode, userParams); if(CollectionUtil.isNotEmpty(sysDepartModels)){ - List userIds = sysDepartModels.stream().map(SysUserSysDepPostModel::getId).toList(); + List userIds = sysDepartModels.stream().map(SysUserSysDepPostModel::getId).collect(Collectors.toList()); //获取部门名称 Map useDepNames = this.getDepNamesByUserIds(userIds); sysDepartModels.forEach(item -> { diff --git a/jeecg-boot/pom.xml b/jeecg-boot/pom.xml index a7a25d520..c638c837f 100644 --- a/jeecg-boot/pom.xml +++ b/jeecg-boot/pom.xml @@ -269,7 +269,7 @@ org.jeecgframework.boot hibernate-re - 3.8.2-beta + 3.8.2.2