chenxudong
/
electromagnetic-data-new
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

解决已知问题

This commit is contained in:
chenxudong 2025-01-07 13:37:09 +08:00
parent 35e62a2c71
commit 4f826b7f84
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/CommonService.java
View File

@ -184,6 +184,7 @@ public class CommonService {
.setFileName(folderName) .setFileName(folderName)
.setFileVersion(FILE_START_VERSION) .setFileVersion(FILE_START_VERSION)
.setParentId(parentId) .setParentId(parentId)
.setFileType("文件夹")
.setFileCode(createFileCode(parentId, EleDataTypeEnum.FOLDER.desc, FILE_START_VERSION, nowTimeStr)) .setFileCode(createFileCode(parentId, EleDataTypeEnum.FOLDER.desc, FILE_START_VERSION, nowTimeStr))
.setFileTime(nowTimeStr) .setFileTime(nowTimeStr)
.setPrjDir(isPrjDir) .setPrjDir(isPrjDir)

5
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/PermissionServiceImpl.java
View File

@ -1,5 +1,6 @@
package com.electromagnetic.industry.software.manage.service.serviceimpl; package com.electromagnetic.industry.software.manage.service.serviceimpl;
import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.electromagnetic.industry.software.common.enums.FilePermission; import com.electromagnetic.industry.software.common.enums.FilePermission;
import com.electromagnetic.industry.software.common.util.UserThreadLocal; import com.electromagnetic.industry.software.common.util.UserThreadLocal;
@ -36,8 +37,8 @@ public class PermissionServiceImpl implements PermissionService {
List<String> roleIds = getRoles(userId); List<String> roleIds = getRoles(userId);
// 只有当 roleIds 不为空且不为 null 时，才添加 in 条件 // 只有当 roleIds 不为空且不为 null 时，才添加 in 条件
if (roleIds == null || roleIds.isEmpty()) { if (CollUtil.isEmpty(roleIds)) {
return transToMap(new ArrayList<>()); return new HashMap<>();
} }
LambdaQueryWrapper<RolePermission> queryWrapper1 = new LambdaQueryWrapper<>(); LambdaQueryWrapper<RolePermission> queryWrapper1 = new LambdaQueryWrapper<>();
queryWrapper1.select(RolePermission::getPermissionCode) queryWrapper1.select(RolePermission::getPermissionCode)