Merge branch 'develop' of http://139.196.179.195:3000/chenxudong/electromagnetic-data-new into develop

electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/UserController.java

@@ -101,7 +101,7 @@ public class UserController {
         }
     }
 
-//    @RequiredRole(AdminTypeEnum.SYSTEM)
+    //    @RequiredRole(AdminTypeEnum.SYSTEM)
     @PutMapping("/changePassword")
     @UserOperation(value = "修改用户密码", modelName = UserOperationModuleEnum.USER)
     public ElectromagneticResult<?> changePassword(@RequestBody ChangePasswordRequest request) {

electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java

@@ -1448,8 +1448,8 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
         if (StringUtils.isNotBlank(parentId)) {
             LambdaQueryWrapper<EdFileInfo> queryWrapper = new LambdaQueryWrapper<>();
             queryWrapper.eq(EdFileInfo::getParentId, parentId)
-                        .eq(EdFileInfo::getSaveStatus, EleDataSaveStatusEnum.SUCCESS.code)
+                    .eq(EdFileInfo::getSaveStatus, EleDataSaveStatusEnum.SUCCESS.code)
-                        .eq(EdFileInfo::getEffectFlag, EffectFlagEnum.EFFECT.code);
+                    .eq(EdFileInfo::getEffectFlag, EffectFlagEnum.EFFECT.code);
             fileIds = this.baseMapper.selectList(queryWrapper).stream().map(EdFileInfo::getFileId).collect(Collectors.toList());
         } else {
             LambdaQueryWrapper<EdFileFavorite> queryWrapper = new LambdaQueryWrapper<>();
@@ -1463,7 +1463,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
         fileInfoVOIPage.getRecords().forEach(e -> {
             e.setFileSizeShow(EleCommonUtil.convertFileSize(e.getFileSize()));
             e.setIsFavorite(isFavorite(UserThreadLocal.getUserId(), e.getId()) ? 1 : 0);
-            e.setIsPersonal( (String.valueOf(DataOwnEnum.USER_FILE.code).equals(e.getDataOwn()) && Objects.equals(e.getCreatedBy(), UserThreadLocal.getUserId())) ? 1 : 0);
+            e.setIsPersonal((String.valueOf(DataOwnEnum.USER_FILE.code).equals(e.getDataOwn()) && Objects.equals(e.getCreatedBy(), UserThreadLocal.getUserId())) ? 1 : 0);
             // 设置权限
             Map<String, Boolean> permissions = (e.getIsPersonal() == 1)
                     ? permissionService.getPersonalPermission()

electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileRecycleServiceImpl.java

@@ -86,6 +86,7 @@ public class FileRecycleServiceImpl implements FileRecycleService {
                 .orderByAsc(ObjUtil.equals(pars.getFileTypeSort(), 0), EdFileInfo::getSort)
                 .orderByDesc(ObjUtil.equals(pars.getFileTypeSort(), 1), EdFileInfo::getSort);
 
+
         if (StrUtil.isNotEmpty(pars.getKeyword())) {
             queryWrapper.and(qr -> qr.like(EdFileInfo::getFileName, pars.getKeyword())
                     .or()
@@ -95,17 +96,18 @@ public class FileRecycleServiceImpl implements FileRecycleService {
                     .or()
                     .like(EdFileInfo::getFileContent, pars.getKeyword()));
         }
-        // TODO 要考虑数据是个人数据还是库数据，如果是管理员，则展示全部数据，其他用户则展示有权限的系统数据+用户个人数据+库数据
+
         if (!UserThreadLocal.getAdminType().equals(AdminTypeEnum.SYSTEM.getValue())) {
+            List<String> ids = edFileInfoMapper.selectList(Wrappers.<EdFileInfo>lambdaQuery().select(EdFileInfo::getId).eq(EdFileInfo::getDataOwn, DataOwnEnum.USER_FILE.code))
+                    .stream()
+                    .map(EdFileInfo::getId)
+                    .collect(Collectors.toList());
             List<String> accessibleTree = permissionService.getAccessibleTree();
-            queryWrapper.and(qr -> qr.eq(EdFileInfo::getCreatedBy, UserThreadLocal.getUserId()).eq(EdFileInfo::getDataOwn, DataOwnEnum.USER_FILE.code));
+            accessibleTree.addAll(ids);
             if (CollUtil.isNotEmpty(accessibleTree)) {
-                for (String permission : accessibleTree) {
+                queryWrapper.and(qr -> accessibleTree.forEach(e -> qr.or().likeRight(EdFileInfo::getFilePath, e)));
-                    queryWrapper.or().likeRight(EdFileInfo::getFileCode, permission);
-                }
             }
         }
-
         Page<EdFileInfo> edFileInfoPage = this.edFileInfoMapper.selectPage(new Page<>(pars.getPageNum(), pars.getPageSize()), queryWrapper);
         long total = edFileInfoPage.getTotal();
         List<FileRecycleQueryVO> records = BeanUtil.copyToList(edFileInfoPage.getRecords(), FileRecycleQueryVO.class);