解决jdk8兼容问题

This commit is contained in:
JEECG
2025-10-10 18:05:14 +08:00
parent cab42b819c
commit 5e37b4de8f
6 changed files with 13 additions and 7 deletions

View File

@@ -155,6 +155,9 @@ JeecgBoot平台提供了一套完善的AI应用管理系统模块是一套类
#### 前端 #### 前端
- 前端环境要求Node.js要求`Node 20+` 版本以上、pnpm 要求`9+` 版本以上 - 前端环境要求Node.js要求`Node 20+` 版本以上、pnpm 要求`9+` 版本以上
> Vite 不再支持已结束生命周期EOL的 Node.js 18。现在需要使用 Node.js 20.19+ 或 22.12+。
- 依赖管理node、npm、pnpm - 依赖管理node、npm、pnpm
- 前端IDE建议IDEA、WebStorm、Vscode - 前端IDE建议IDEA、WebStorm、Vscode
- 采用 Vue3.0+TypeScript+Vite6+Ant-Design-Vue4等新技术方案包括二次封装组件、utils、hooks、动态菜单、权限校验、按钮级别权限控制等功能 - 采用 Vue3.0+TypeScript+Vite6+Ant-Design-Vue4等新技术方案包括二次封装组件、utils、hooks、动态菜单、权限校验、按钮级别权限控制等功能

View File

@@ -2055,7 +2055,10 @@ public class SysBaseApiImpl implements ISysBaseAPI {
if(oConvertUtils.isEmpty(code)) { if(oConvertUtils.isEmpty(code)) {
return null; return null;
} }
List<SysDepart> list = sysDepartList.stream().filter(sysDepart -> sysDepart.getOrgCode().equals(code)).toList(); List<SysDepart> list = sysDepartList.stream()
.filter(sysDepart -> sysDepart.getOrgCode().equals(code))
.collect(Collectors.toList());
//判断去上级的级别 //判断去上级的级别
if(!CollectionUtils.isEmpty(list) && nowLevel == level) { if(!CollectionUtils.isEmpty(list) && nowLevel == level) {
return list.get(0); return list.get(0);

View File

@@ -785,7 +785,7 @@ public class SysDepartServiceImpl extends ServiceImpl<SysDepartMapper, SysDepart
List<String> departIdList = new ArrayList<>(); List<String> departIdList = new ArrayList<>();
//如果前端传过来的部门id不为空的时候说明是系统用户根据所属部门选择主岗位或者兼职岗位 //如果前端传过来的部门id不为空的时候说明是系统用户根据所属部门选择主岗位或者兼职岗位
if(oConvertUtils.isNotEmpty(departIds) && oConvertUtils.isEmpty(parentId)){ if(oConvertUtils.isNotEmpty(departIds) && oConvertUtils.isEmpty(parentId)){
departIdList = list.stream().map(SysDepart::getId).toList(); departIdList = list.stream().map(SysDepart::getId).collect(Collectors.toList());
} }
List<SysDepartTreeModel> records = new ArrayList<>(); List<SysDepartTreeModel> records = new ArrayList<>();
for (int i = 0; i < list.size(); i++) { for (int i = 0; i < list.size(); i++) {
@@ -1859,7 +1859,7 @@ public class SysDepartServiceImpl extends ServiceImpl<SysDepartMapper, SysDepart
List<SysDepart> sysDepartList = departMapper.selectList(query); List<SysDepart> sysDepartList = departMapper.selectList(query);
if(!CollectionUtils.isEmpty(sysDepartList)){ if(!CollectionUtils.isEmpty(sysDepartList)){
//获取部门名称拼接返回给前台 //获取部门名称拼接返回给前台
List<String> departNameList = sysDepartList.stream().map(SysDepart::getDepartName).toList(); List<String> departNameList = sysDepartList.stream().map(SysDepart::getDepartName).collect(Collectors.toList());
String departNames = String.join("/", departNameList); String departNames = String.join("/", departNameList);
redisUtil.set(CommonConstant.DEPART_NAME_REDIS_KEY_PRE + orgCode,departNames); redisUtil.set(CommonConstant.DEPART_NAME_REDIS_KEY_PRE + orgCode,departNames);
return departNames; return departNames;

View File

@@ -100,11 +100,11 @@ public class SysTenantPackServiceImpl extends ServiceImpl<SysTenantPackMapper, S
// 提取已存在的用户ID // 提取已存在的用户ID
List<String> existingUserIds = existingUsers.stream() List<String> existingUserIds = existingUsers.stream()
.map(SysTenantPackUser::getUserId) .map(SysTenantPackUser::getUserId)
.toList(); .collect(Collectors.toList());
// 过滤出需要新增的用户ID // 过滤出需要新增的用户ID
List<String> newUserIds = userIds.stream() List<String> newUserIds = userIds.stream()
.filter(userId -> !existingUserIds.contains(userId)) .filter(userId -> !existingUserIds.contains(userId))
.toList(); .collect(Collectors.toList());
for (String userId : newUserIds) { for (String userId : newUserIds) {
//update-end---author:wangshuai---date:2025-09-03---for: 编辑时需要查看有没有未分配的用户--- //update-end---author:wangshuai---date:2025-09-03---for: 编辑时需要查看有没有未分配的用户---
SysTenantPackUser tenantPackUser = new SysTenantPackUser(tenantId, packId, userId); SysTenantPackUser tenantPackUser = new SysTenantPackUser(tenantId, packId, userId);

View File

@@ -2734,7 +2734,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
public IPage<SysUserSysDepPostModel> queryDepartPostUserByOrgCode(String orgCode, SysUser userParams, IPage page) { public IPage<SysUserSysDepPostModel> queryDepartPostUserByOrgCode(String orgCode, SysUser userParams, IPage page) {
List<SysUserSysDepPostModel> sysDepartModels = baseMapper.queryDepartPostUserByOrgCode(page, orgCode, userParams); List<SysUserSysDepPostModel> sysDepartModels = baseMapper.queryDepartPostUserByOrgCode(page, orgCode, userParams);
if(CollectionUtil.isNotEmpty(sysDepartModels)){ if(CollectionUtil.isNotEmpty(sysDepartModels)){
List<String> userIds = sysDepartModels.stream().map(SysUserSysDepPostModel::getId).toList(); List<String> userIds = sysDepartModels.stream().map(SysUserSysDepPostModel::getId).collect(Collectors.toList());
//获取部门名称 //获取部门名称
Map<String, String> useDepNames = this.getDepNamesByUserIds(userIds); Map<String, String> useDepNames = this.getDepNamesByUserIds(userIds);
sysDepartModels.forEach(item -> { sysDepartModels.forEach(item -> {

View File

@@ -269,7 +269,7 @@
<dependency> <dependency>
<groupId>org.jeecgframework.boot</groupId> <groupId>org.jeecgframework.boot</groupId>
<artifactId>hibernate-re</artifactId> <artifactId>hibernate-re</artifactId>
<version>3.8.2-beta</version> <version>3.8.2.2</version>
</dependency> </dependency>
<!--mongon db--> <!--mongon db-->