From 4f826b7f8496b7385138af653bcc3d831b0f8d02 Mon Sep 17 00:00:00 2001 From: chenxudong Date: Tue, 7 Jan 2025 13:37:09 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=B7=B2=E7=9F=A5=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../software/manage/service/serviceimpl/CommonService.java | 1 + .../manage/service/serviceimpl/PermissionServiceImpl.java | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/CommonService.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/CommonService.java index 9471d0c..45545de 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/CommonService.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/CommonService.java @@ -184,6 +184,7 @@ public class CommonService { .setFileName(folderName) .setFileVersion(FILE_START_VERSION) .setParentId(parentId) + .setFileType("文件夹") .setFileCode(createFileCode(parentId, EleDataTypeEnum.FOLDER.desc, FILE_START_VERSION, nowTimeStr)) .setFileTime(nowTimeStr) .setPrjDir(isPrjDir) diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/PermissionServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/PermissionServiceImpl.java index e912cc4..fe22891 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/PermissionServiceImpl.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/PermissionServiceImpl.java @@ -1,5 +1,6 @@ package com.electromagnetic.industry.software.manage.service.serviceimpl; +import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.electromagnetic.industry.software.common.enums.FilePermission; import com.electromagnetic.industry.software.common.util.UserThreadLocal; @@ -36,8 +37,8 @@ public class PermissionServiceImpl implements PermissionService { List roleIds = getRoles(userId); // 只有当 roleIds 不为空且不为 null 时，才添加 in 条件 - if (roleIds == null || roleIds.isEmpty()) { - return transToMap(new ArrayList<>()); + if (CollUtil.isEmpty(roleIds)) { + return new HashMap<>(); } LambdaQueryWrapper queryWrapper1 = new LambdaQueryWrapper<>(); queryWrapper1.select(RolePermission::getPermissionCode)