From 153cc3fd4ef015a8b1390b2eef3d102c5859a5e7 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 29 三月 2024 16:07:48 +0800
Subject: [PATCH] dnc Module error fix

---
 smart-man-boot/src/main/java/com/qianwen/smartman/modules/dnc/service/impl/FileServiceImpl.java |  712 +++++++++++++---------------------------------------------
 1 files changed, 164 insertions(+), 548 deletions(-)

diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/dnc/service/impl/FileServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/dnc/service/impl/FileServiceImpl.java
index fade4ef..a8f540c 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/dnc/service/impl/FileServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/dnc/service/impl/FileServiceImpl.java
@@ -1,13 +1,5 @@
 package com.qianwen.smartman.modules.dnc.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.IdWorker;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.google.common.collect.Lists;
-import java.lang.invoke.SerializedLambda;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -18,17 +10,19 @@
 import java.util.Objects;
 import java.util.Optional;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
-import lombok.NonNull;
+
 import org.apache.commons.lang3.StringUtils;
-import com.qianwen.smartman.common.cache.ParamCache;
-import com.qianwen.smartman.common.cache.RegionCache;
-import com.qianwen.smartman.common.cache.UserCache;
-import com.qianwen.smartman.common.constant.CommonConstant;
-import com.qianwen.smartman.common.constant.DncConstant;
-import com.qianwen.smartman.common.utils.ExtraLambdaQueryWrapper;
-import com.qianwen.smartman.common.utils.Lambda;
-import com.qianwen.smartman.common.utils.MessageUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.google.common.collect.Lists;
 import com.qianwen.core.log.exception.ServiceException;
 import com.qianwen.core.mp.base.BaseServiceImpl;
 import com.qianwen.core.mp.support.Condition;
@@ -39,6 +33,12 @@
 import com.qianwen.core.tool.node.ForestNodeMerger;
 import com.qianwen.core.tool.utils.FileUtil;
 import com.qianwen.core.tool.utils.Func;
+import com.qianwen.smartman.common.cache.ParamCache;
+import com.qianwen.smartman.common.cache.UserCache;
+import com.qianwen.smartman.common.constant.CommonConstant;
+import com.qianwen.smartman.common.constant.DncConstant;
+import com.qianwen.smartman.common.utils.Lambda;
+import com.qianwen.smartman.common.utils.MessageUtils;
 import com.qianwen.smartman.modules.cps.service.IWorkstationService;
 import com.qianwen.smartman.modules.cps.vo.WorkstationVO;
 import com.qianwen.smartman.modules.dnc.convert.FileConvert;
@@ -69,10 +69,8 @@
 import com.qianwen.smartman.modules.dnc.vo.UploadFileOssVO;
 import com.qianwen.smartman.modules.resource.builder.oss.OssBuilder;
 import com.qianwen.smartman.modules.system.entity.User;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
+
+import lombok.NonNull;
 
 @Service
 /* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/dnc/service/impl/FileServiceImpl.class */
@@ -91,470 +89,6 @@
     @Autowired
     private IObsFileService obsFileService;
 
-    private static /* synthetic */ Object $deserializeLambda$(SerializedLambda lambda) {
-        String implMethodName = lambda.getImplMethodName();
-        boolean z = true;
-        switch (implMethodName.hashCode()) {
-            case -1041904421:
-                if (implMethodName.equals("getParentId")) {
-                    z = true;
-                    break;
-                }
-                break;
-            case -593679572:
-                if (implMethodName.equals("getUpdateTime")) {
-                    z = true;
-                    break;
-                }
-                break;
-            case 98245393:
-                if (implMethodName.equals("getId")) {
-                    z = true;
-                    break;
-                }
-                break;
-            case 124572976:
-                if (implMethodName.equals("getAllPath")) {
-                    z = true;
-                    break;
-                }
-                break;
-            case 537556537:
-                if (implMethodName.equals("getIsCurrent")) {
-                    z = true;
-                    break;
-                }
-                break;
-            case 804592199:
-                if (implMethodName.equals("getSuffix")) {
-                    z = true;
-                    break;
-                }
-                break;
-            case 1073880375:
-                if (implMethodName.equals("getDisplayName")) {
-                    z = true;
-                    break;
-                }
-                break;
-            case 1342380108:
-                if (implMethodName.equals("getFileType")) {
-                    z = true;
-                    break;
-                }
-                break;
-            case 1388468386:
-                if (implMethodName.equals("getVersion")) {
-                    z = false;
-                    break;
-                }
-                break;
-            case 1961990397:
-                if (implMethodName.equals("getOwner")) {
-                    z = true;
-                    break;
-                }
-                break;
-        }
-        switch (z) {
-            case false:
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/File") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
-                    return (v0) -> {
-                        return v0.getVersion();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/File") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
-                    return (v0) -> {
-                        return v0.getVersion();
-                    };
-                }
-                break;
-            case true:
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/util/Date;")) {
-                    return (v0) -> {
-                        return v0.getUpdateTime();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/util/Date;")) {
-                    return (v0) -> {
-                        return v0.getUpdateTime();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/util/Date;")) {
-                    return (v0) -> {
-                        return v0.getUpdateTime();
-                    };
-                }
-                break;
-            case true:
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/File") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getSuffix();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/File") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getSuffix();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/File") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getSuffix();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/File") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getSuffix();
-                    };
-                }
-                break;
-            case true:
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/File") && lambda.getImplMethodSignature().equals("()Ljava/lang/Boolean;")) {
-                    return (v0) -> {
-                        return v0.getIsCurrent();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/File") && lambda.getImplMethodSignature().equals("()Ljava/lang/Boolean;")) {
-                    return (v0) -> {
-                        return v0.getIsCurrent();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/File") && lambda.getImplMethodSignature().equals("()Ljava/lang/Boolean;")) {
-                    return (v0) -> {
-                        return v0.getIsCurrent();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/File") && lambda.getImplMethodSignature().equals("()Ljava/lang/Boolean;")) {
-                    return (v0) -> {
-                        return v0.getIsCurrent();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/File") && lambda.getImplMethodSignature().equals("()Ljava/lang/Boolean;")) {
-                    return (v0) -> {
-                        return v0.getIsCurrent();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/File") && lambda.getImplMethodSignature().equals("()Ljava/lang/Boolean;")) {
-                    return (v0) -> {
-                        return v0.getIsCurrent();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/File") && lambda.getImplMethodSignature().equals("()Ljava/lang/Boolean;")) {
-                    return (v0) -> {
-                        return v0.getIsCurrent();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/File") && lambda.getImplMethodSignature().equals("()Ljava/lang/Boolean;")) {
-                    return (v0) -> {
-                        return v0.getIsCurrent();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/File") && lambda.getImplMethodSignature().equals("()Ljava/lang/Boolean;")) {
-                    return (v0) -> {
-                        return v0.getIsCurrent();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/File") && lambda.getImplMethodSignature().equals("()Ljava/lang/Boolean;")) {
-                    return (v0) -> {
-                        return v0.getIsCurrent();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/File") && lambda.getImplMethodSignature().equals("()Ljava/lang/Boolean;")) {
-                    return (v0) -> {
-                        return v0.getIsCurrent();
-                    };
-                }
-                break;
-            case true:
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/File") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getDisplayName();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/File") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getDisplayName();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/File") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getDisplayName();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/File") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getDisplayName();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/File") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getDisplayName();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/File") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getDisplayName();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/File") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getDisplayName();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/File") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getDisplayName();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/File") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getDisplayName();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/File") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getDisplayName();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/File") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getDisplayName();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/File") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getDisplayName();
-                    };
-                }
-                break;
-            case RegionCache.VILLAGE_LEVEL /* 5 */:
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getId();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getId();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getId();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getId();
-                    };
-                }
-                break;
-            case true:
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/File") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getOwner();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/File") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getOwner();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/File") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getOwner();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/File") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getOwner();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/File") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getOwner();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/File") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getOwner();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/File") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getOwner();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/File") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getOwner();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/File") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getOwner();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/File") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getOwner();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/File") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getOwner();
-                    };
-                }
-                break;
-            case true:
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/File") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getAllPath();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/File") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getAllPath();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/File") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getAllPath();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/File") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getAllPath();
-                    };
-                }
-                break;
-            case true:
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/File") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getParentId();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/File") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getParentId();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/File") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getParentId();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/File") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getParentId();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/File") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getParentId();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/File") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getParentId();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/File") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getParentId();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/File") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getParentId();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/File") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getParentId();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/File") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getParentId();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/File") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getParentId();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/File") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getParentId();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/File") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getParentId();
-                    };
-                }
-                break;
-            case true:
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/File") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
-                    return (v0) -> {
-                        return v0.getFileType();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/File") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
-                    return (v0) -> {
-                        return v0.getFileType();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/File") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
-                    return (v0) -> {
-                        return v0.getFileType();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/File") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
-                    return (v0) -> {
-                        return v0.getFileType();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/File") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
-                    return (v0) -> {
-                        return v0.getFileType();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/File") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
-                    return (v0) -> {
-                        return v0.getFileType();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/File") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
-                    return (v0) -> {
-                        return v0.getFileType();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/File") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
-                    return (v0) -> {
-                        return v0.getFileType();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/File") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
-                    return (v0) -> {
-                        return v0.getFileType();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/File") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
-                    return (v0) -> {
-                        return v0.getFileType();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/File") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
-                    return (v0) -> {
-                        return v0.getFileType();
-                    };
-                }
-                break;
-        }
-        throw new IllegalArgumentException("Invalid lambda deserialization");
-    }
 
     @Override // org.springblade.modules.dnc.service.IFileService
     @Transactional(rollbackFor = {Exception.class})
@@ -576,6 +110,10 @@
             }
             Long userId = user.getUserId();
             File file = File.builder().fileType(Integer.valueOf(FileType.FILE.getValue())).owner(userId).objectKey(fileDto.getName()).contentMd5(fileDto.getHash()).displayName(createFileDto.getName()).contentType(fileDto.getContentType()).contentLength(Long.valueOf(fileDto.getLength())).suffix(FileUtil.getFileExtension(createFileDto.getName())).isCurrent(true).link(createFileDto.getOssFile().getLink()).build();
+            File latestFile = getOne(Lambda.<File>create().eq(File::getParentId, createFileDto.getTargetId())
+            		.eq(File::getOwner, userId).eq(File::getFileType, Integer.valueOf(FileType.FILE.getValue()))
+            		.eq(File::getDisplayName, createFileDto.getName()).limit(Integer.valueOf(1)).orderByDesc(File::getVersion));
+            /*
             File latestFile = (File) getOne((Wrapper) ((ExtraLambdaQueryWrapper) ((ExtraLambdaQueryWrapper) ((ExtraLambdaQueryWrapper) ((ExtraLambdaQueryWrapper) Lambda.create().eq((v0) -> {
                 return v0.getParentId();
             }, createFileDto.getTargetId())).eq((v0) -> {
@@ -586,7 +124,7 @@
                 return v0.getDisplayName();
             }, createFileDto.getName())).limit(1).orderByDesc((v0) -> {
                 return v0.getVersion();
-            }));
+            }));*/
             if (Func.isEmpty(latestFile)) {
                 file.setVersion(DncConstant.DEFAULT_VERSION);
                 createFile(sourceType, createFileDto, file, userId, operationType);
@@ -613,10 +151,10 @@
         createFileDto.setId(id);
     }
 
-    @Override // org.springblade.modules.dnc.service.IFileService
+    @Override
     public List<FolderVO> lazyFolderList(Long userId, String id) {
         List<File> folderList = findFolderList(userId, id);
-        return (List) folderList.stream().map(f -> {
+        return folderList.stream().map(f -> {
             FolderVO vo = FileConvert.INSTANCE.convertToFolderVO(f);
             ((FolderVO) Objects.requireNonNull(vo)).setName(f.getDisplayName());
             return vo;
@@ -625,28 +163,32 @@
 
     @Override // org.springblade.modules.dnc.service.IFileService
     public List<FolderTreeVO> folderTreeList(final Long userId) {
+    	List<File> list = list(Lambda.eq(File::getOwner, userId).eq(File::getFileType, 
+    	          Integer.valueOf(FileType.FOLDER.getValue())));
+    	
+    	return ForestNodeMerger.merge(list.stream().map(FileConvert.INSTANCE::convertToFolderTreeVO)
+    	        .peek(vo -> vo.setGroup((vo.getParentId().longValue() == 0L || vo.getId().longValue() == 0L)))
+    	        .collect(Collectors.toList()));
+    	/*
         List<File> list = list((Wrapper) Lambda.eq((v0) -> {
             return v0.getOwner();
         }, userId).eq((v0) -> {
             return v0.getFileType();
         }, Integer.valueOf(FileType.FOLDER.getValue())));
+        
         Stream<File> stream = list.stream();
         FileConvert fileConvert = FileConvert.INSTANCE;
         fileConvert.getClass();
         return ForestNodeMerger.merge((List) stream.map(this::convertToFolderTreeVO).peek(vo -> {
             vo.setGroup(vo.getParentId().longValue() == 0 || vo.getId().longValue() == 0);
-        }).collect(Collectors.toList()));
+        }).collect(Collectors.toList()));*/
     }
 
     @Override // org.springblade.modules.dnc.service.IFileService
     public List<File> findFolderList(Long userId, String id) {
-        return this.baseMapper.selectList((LambdaQueryWrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) Wrappers.query().lambda().eq((v0) -> {
-            return v0.getOwner();
-        }, userId)).eq((v0) -> {
-            return v0.getParentId();
-        }, id)).eq((v0) -> {
-            return v0.getFileType();
-        }, Integer.valueOf(FileType.FOLDER.getValue())));
+    	LambdaQueryWrapper<File> query = Wrappers.<File>query().lambda().eq(File::getOwner, userId).eq(File::getParentId, id).eq(File::getFileType, Integer.valueOf(FileType.FOLDER.getValue()));
+    	
+        return this.baseMapper.selectList(query);
     }
 
     @Override // org.springblade.modules.dnc.service.IFileService
@@ -710,28 +252,15 @@
     }
 
     public Collection<File> findFiles(Long userId, Long parentId, String searchKey) {
-        LambdaQueryWrapper lambdaQueryWrapper;
-        LambdaQueryWrapper<File> query = (LambdaQueryWrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) Wrappers.query().lambda().eq((v0) -> {
-            return v0.getOwner();
-        }, userId)).eq((v0) -> {
-            return v0.getIsCurrent();
-        }, true)).likeRight(StringUtils.isNoneBlank(new CharSequence[]{searchKey}), (v0) -> {
-            return v0.getDisplayName();
-        }, searchKey).orderByAsc((v0) -> {
-            return v0.getFileType();
-        })).orderByDesc((v0) -> {
-            return v0.getUpdateTime();
-        });
+    	LambdaQueryWrapper<File> query = Wrappers.<File>query().lambda().eq(File::getOwner, userId).eq(File::getIsCurrent, Boolean.valueOf(true))
+    			.likeRight(StringUtils.isNoneBlank(searchKey), File::getDisplayName, searchKey)
+    			.orderByAsc(File::getFileType).orderByDesc(File::getUpdateTime);
         if (parentId != null) {
-            lambdaQueryWrapper = (LambdaQueryWrapper) query.eq((v0) -> {
-                return v0.getParentId();
-            }, parentId);
+        	query = (LambdaQueryWrapper<File>)query.eq(File::getParentId, parentId);
         } else {
-            lambdaQueryWrapper = (LambdaQueryWrapper) query.isNull((v0) -> {
-                return v0.getParentId();
-            });
+        	query = (LambdaQueryWrapper<File>)query.isNull(File::getParentId);
         }
-        return this.baseMapper.selectList(lambdaQueryWrapper);
+        return this.baseMapper.selectList(query);
     }
 
     private void checkDisplayName(Long parentId, String name, Long userId, Integer fileType) {
@@ -739,6 +268,11 @@
             throw new ServiceException(MessageUtils.message("dnc.filename.cannot.contains", new Object[0]));
         }
         if (FileType.FOLDER.getValue() == fileType.intValue()) {
+        	 QueryWrapper<File> queryWrapper = new QueryWrapper<>();
+             queryWrapper.lambda().eq(File::getDisplayName, name)
+               .eq(File::getOwner, userId)
+               .eq(File::getParentId, parentId);
+        	/*
             QueryWrapper<File> queryWrapper = new QueryWrapper<>();
             ((LambdaQueryWrapper) ((LambdaQueryWrapper) queryWrapper.lambda().eq((v0) -> {
                 return v0.getDisplayName();
@@ -746,7 +280,7 @@
                 return v0.getOwner();
             }, userId)).eq((v0) -> {
                 return v0.getParentId();
-            }, parentId);
+            }, parentId);*/
             List<File> files = list(queryWrapper);
             if (Func.isNotEmpty(files)) {
                 throw new ServiceException(MessageUtils.message("dnc.file.name.exist", new Object[0]));
@@ -794,6 +328,12 @@
     }
 
     private void changeCurrent(Long parentId, File file) {
+    	List<File> list = list(Wrappers.<File>lambdaQuery().ne(File::getId, file.getId())
+    	        .eq(File::getDisplayName, file.getDisplayName())
+    	        .eq(File::getParentId, parentId)
+    	        .eq(File::getIsCurrent, Boolean.valueOf(true))
+    	        .eq(File::getFileType, Integer.valueOf(FileType.FILE.getValue())));
+    	/*
         List<File> list = list((Wrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().ne((v0) -> {
             return v0.getId();
         }, file.getId())).eq((v0) -> {
@@ -804,7 +344,7 @@
             return v0.getIsCurrent();
         }, true)).eq((v0) -> {
             return v0.getFileType();
-        }, Integer.valueOf(FileType.FILE.getValue())));
+        }, Integer.valueOf(FileType.FILE.getValue())));*/
         list.forEach(f -> {
             f.setIsCurrent(false);
             f.setCoverTime(new Date());
@@ -829,9 +369,13 @@
         deleteFileVO.getSourceIdList().forEach(id -> {
             File file = (File) this.baseMapper.selectById(id);
             PathDto pathDto = getPathDto(file);
+            
+            LambdaQueryWrapper<File> deleteWrapper = Wrappers.<File>query().lambda().like(Func.isNotBlank(file.getAllPath()), File::getAllPath, file.getAllPath() + "%");
+            this.baseMapper.delete(deleteWrapper);
+            /*
             this.baseMapper.delete((LambdaQueryWrapper) Wrappers.query().lambda().like(Func.isNotBlank(file.getAllPath()), (v0) -> {
                 return v0.getAllPath();
-            }, file.getAllPath() + "%"));
+            }, file.getAllPath() + "%"));*/
             saveOperationLog(AuthUtil.getUser(), file, DncEnums.LogOperationType.DELETE.getCode(), DncEnums.LogFileSourceType.MY_DOCUMENTS.getCode(), pathDto.getAllPathId(), pathDto.getAllPathName());
         });
     }
@@ -843,7 +387,7 @@
             return getById(v1);
         }).map((v0) -> {
             return v0.getDisplayName();
-        }).reduce(a, b -> {
+        }).reduce((a, b) -> {
             return a + "/" + b;
         }).orElse("");
         return new PathDto(allPath, allPathName);
@@ -864,27 +408,32 @@
             }
             String sourcePath = sourceFile.getAllPath();
             Optional<File> parentFile = (target == null || target.equals(0L)) ? Optional.empty() : Optional.of(getById(target));
-            List<String> targetPath = (List) parentFile.map((v0) -> {
+            List<String> targetPath = parentFile.map((v0) -> {
                 return v0.pathList();
-            }).orElse(new ArrayList());
+            }).orElse(new ArrayList<>());
             sourceFile.changeParent(target);
             sourceFile.joinPath(targetPath, source.toString());
+            
+            LambdaQueryWrapper<File> wrapper = Wrappers.<File>query().lambda().like(File::getAllPath, sourcePath + "%")
+            		.eq(File::getIsCurrent, DncConstant.IS_CURRENT).ne(File::getId, source);
+            List<File> subFileList = list(wrapper);
+            /*
             List<File> subFileList = list((LambdaQueryWrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) Wrappers.query().lambda().like((v0) -> {
                 return v0.getAllPath();
             }, sourcePath + "%")).eq((v0) -> {
                 return v0.getIsCurrent();
             }, DncConstant.IS_CURRENT)).ne((v0) -> {
                 return v0.getId();
-            }, source));
+            }, source));*/
             updateById(sourceFile);
             saveOperationLog(AuthUtil.getUser(), sourceFile, DncEnums.LogOperationType.MOVE.getCode(), DncEnums.LogFileSourceType.MY_DOCUMENTS.getCode(), pathDto.getAllPathId(), pathDto.getAllPathName());
             if (!subFileList.isEmpty()) {
                 for (File file : subFileList) {
                     file.setCreateTime(new Date());
                     PathDto childrenPathDto = getPathDto(file);
-                    file.joinPath((List) parentFile.map((v0) -> {
+                    file.joinPath(parentFile.map((v0) -> {
                         return v0.pathList();
-                    }).orElse(new ArrayList()), source.toString());
+                    }).orElse(new ArrayList<>()), source.toString());
                     updateById(file);
                     saveOperationLog(AuthUtil.getUser(), file, DncEnums.LogOperationType.MOVE.getCode(), DncEnums.LogFileSourceType.MY_DOCUMENTS.getCode(), childrenPathDto.getAllPathId(), childrenPathDto.getAllPathName());
                 }
@@ -893,6 +442,15 @@
     }
 
     private List<File> findFile(List<Long> fileId, Long parentId, String newName, Long userId, Integer fileType) {
+    	QueryWrapper<File> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda()
+          .eq((fileType.intValue() == FileType.FOLDER.getValue()), File::getDisplayName, newName)
+          .eq((fileType.intValue() == FileType.FILE.getValue()), File::getDisplayName, newName)
+          .eq(File::getParentId, parentId)
+          .eq(File::getFileType, fileType)
+          .eq(File::getOwner, userId)
+          .eq(File::getIsCurrent, DncConstant.IS_CURRENT);
+    	/*
         Wrapper queryWrapper = new QueryWrapper();
         ((LambdaQueryWrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) queryWrapper.lambda().eq(fileType.intValue() == FileType.FOLDER.getValue(), (v0) -> {
             return v0.getDisplayName();
@@ -906,12 +464,21 @@
             return v0.getOwner();
         }, userId)).eq((v0) -> {
             return v0.getIsCurrent();
-        }, DncConstant.IS_CURRENT);
+        }, DncConstant.IS_CURRENT);*/
         return this.baseMapper.selectList(queryWrapper);
     }
 
     private List<File> renameFindFile(Long fileId, Long parentId, String newName, Integer fileType) {
-        Wrapper queryWrapper = new QueryWrapper();
+    	QueryWrapper<File> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda()
+          .eq((fileType.intValue() == FileType.FOLDER.getValue()), File::getDisplayName, newName)
+          .eq((fileType.intValue() == FileType.FILE.getValue()), File::getDisplayName, newName)
+          .eq(File::getParentId, parentId)
+          .eq(File::getFileType, fileType)
+          .eq(File::getOwner, AuthUtil.getUserId())
+          .eq(File::getIsCurrent, Boolean.valueOf(true))
+          .ne(File::getId, fileId);
+    	/*
         ((LambdaQueryWrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) queryWrapper.lambda().eq(fileType.intValue() == FileType.FOLDER.getValue(), (v0) -> {
             return v0.getDisplayName();
         }, newName).eq(fileType.intValue() == FileType.FILE.getValue(), (v0) -> {
@@ -926,7 +493,7 @@
             return v0.getIsCurrent();
         }, true)).ne((v0) -> {
             return v0.getId();
-        }, fileId);
+        }, fileId);*/
         return this.baseMapper.selectList(queryWrapper);
     }
 
@@ -957,32 +524,37 @@
             String targetPath = (String) parentFile.map((v0) -> {
                 return v0.getAllPath();
             }).orElse(null);
+            
+            LambdaQueryWrapper<File> wrapper = Wrappers.<File>query().lambda().eq(File::getIsCurrent, DncConstant.IS_CURRENT)
+            		.like(File::getAllPath, sourceFile.getAllPath() + "%");
+            List<File> subFileList = list(wrapper);
+            /*
             List<File> subFileList = list((LambdaQueryWrapper) ((LambdaQueryWrapper) Wrappers.query().lambda().eq((v0) -> {
                 return v0.getIsCurrent();
             }, DncConstant.IS_CURRENT)).like((v0) -> {
                 return v0.getAllPath();
-            }, sourceFile.getAllPath() + "%"));
+            }, sourceFile.getAllPath() + "%"));*/
             subFileList.forEach(file -> {
                 file.setMark(Long.valueOf(IdWorker.getId()));
             });
-            Map<Long, PathDto> keyToPath = (Map) subFileList.stream().collect(Collectors.toMap((v0) -> {
+            Map<Long, PathDto> keyToPath = subFileList.stream().collect(Collectors.toMap((v0) -> {
                 return v0.getMark();
             }, this::getPathDto));
-            List<Long> ids = (List) subFileList.stream().map((v0) -> {
+            List<Long> ids =  subFileList.stream().map((v0) -> {
                 return v0.getId();
             }).collect(Collectors.toList());
             List<File> files = findFile(ids, target, sourceFile.getDisplayName(), AuthUtil.getUserId(), sourceFile.getFileType());
             if (Func.isNotEmpty(files)) {
                 throw new ServiceException(MessageUtils.message("dnc.file.already.exist", new Object[0]));
             }
-            List<File> newFileList = (List) subFileList.stream().map((v0) -> {
+            List<File> newFileList = subFileList.stream().map((v0) -> {
                 return v0.copy();
             }).map(c -> {
-                c.joinPath(new ArrayList(), source.toString());
+                c.joinPath(new ArrayList<>(), source.toString());
                 return c;
             }).collect(Collectors.toList());
             saveBatch(newFileList);
-            Map<String, String> idMap = (Map) newFileList.stream().collect(Collectors.toMap((v0) -> {
+            Map<String, String> idMap = newFileList.stream().collect(Collectors.toMap((v0) -> {
                 return v0.lastPathId();
             }, c2 -> {
                 return c2.getId().toString();
@@ -1019,6 +591,13 @@
     public List<String> duplicateName(List<UploadFileOssVO> uploadFileOssVOList) {
         List<String> collect = new ArrayList<>();
         uploadFileOssVOList.forEach(file -> {
+        	File one = getOne(Wrappers.<File>lambdaQuery().eq(File::getFileType, Integer.valueOf(FileType.FILE.getValue()))
+        			.eq(File::getIsCurrent, Boolean.valueOf(true))
+        			.eq(File::getDisplayName, file.getName())
+        			.eq(File::getOwner, AuthUtil.getUser().getUserId())
+        			.eq(File::getParentId, file.getTargetId()));
+        	
+        	/*
             File one = (File) getOne((Wrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
                 return v0.getFileType();
             }, Integer.valueOf(FileType.FILE.getValue()))).eq((v0) -> {
@@ -1029,7 +608,7 @@
                 return v0.getOwner();
             }, AuthUtil.getUser().getUserId())).eq((v0) -> {
                 return v0.getParentId();
-            }, file.getTargetId()));
+            }, file.getTargetId()));*/
             if (one != null) {
                 String objectKey = file.getOssFile().getName();
                 String contentMd5 = one.getContentMd5();
@@ -1048,6 +627,9 @@
 
     @Override // org.springblade.modules.dnc.service.IFileService
     public List<FileHistoryVO> history(Long pid, String name) {
+    	List<File> fileList = list(Wrappers.<File>lambdaQuery().eq(File::getParentId, pid)
+    	        .eq(File::getDisplayName, name).eq(File::getOwner, AuthUtil.getUser().getUserId()).orderByDesc(File::getIsCurrent).orderByDesc(File::getVersion));
+    	/*
         List<File> fileList = list((Wrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
             return v0.getParentId();
         }, pid)).eq((v0) -> {
@@ -1058,7 +640,7 @@
             return v0.getIsCurrent();
         })).orderByDesc((v0) -> {
             return v0.getVersion();
-        }));
+        }));*/
         List<FileHistoryVO> fileHistoryVOList = FileConvert.INSTANCE.convertHistory(fileList);
         fileHistoryVOList.forEach(fileHistoryVO -> {
             User createUser = UserCache.getUser(Long.valueOf(fileHistoryVO.getCreateUser()));
@@ -1092,12 +674,23 @@
 
     @Override // org.springblade.modules.dnc.service.IFileService
     public IPage<FileVO> page(Long userId, Long parent, Integer fileType, String searchKey, Query query) {
-        Wrapper wrapper;
+       // Wrapper wrapper;
         List<String> suffix = new ArrayList<>();
         if (DncEnums.FileType.PROCESSING_PROGRAM.getCode().equals(fileType)) {
             suffix = getSuffix();
         }
         String parentName = getParentName(parent);
+        LambdaQueryWrapper<File> wrapper = Wrappers.<File>query().lambda().eq(File::getOwner, userId)
+        		.eq(File::getIsCurrent, Boolean.valueOf(true))
+        		.in(Func.isNotEmpty(suffix), File::getSuffix, suffix)
+        		.likeRight(StringUtils.isNoneBlank(new CharSequence[] { searchKey }), File::getDisplayName, searchKey)
+        		.orderByAsc(File::getFileType).orderByDesc(File::getUpdateTime);
+        if (parent != null) {
+          wrapper = (LambdaQueryWrapper<File>)wrapper.eq(File::getParentId, parent);
+        } else {
+          wrapper = (LambdaQueryWrapper<File>)wrapper.isNull(File::getParentId);
+        } 
+        /*
         LambdaQueryWrapper<File> wrapper2 = (LambdaQueryWrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) Wrappers.query().lambda().eq((v0) -> {
             return v0.getOwner();
         }, userId)).eq((v0) -> {
@@ -1119,7 +712,7 @@
             wrapper = (LambdaQueryWrapper) wrapper2.isNull((v0) -> {
                 return v0.getParentId();
             });
-        }
+        }*/
         IPage<File> page = page(Condition.getPage(query), wrapper);
         IPage<FileVO> fileVOIPage = FileConvert.INSTANCE.pageConvert(page);
         fileVOIPage.getRecords().forEach(f -> {
@@ -1130,11 +723,14 @@
             f.setUpdateTime((Date) Optional.ofNullable(f.getUpdateTime()).orElse(f.getCreateTime()));
             f.setVersion(Func.isNotBlank(f.getVersion()) ? f.getVersion() + CommonConstant.FILE_SUFFIX : "");
         });
-        List<FileVO> collect = (List) fileVOIPage.getRecords().stream().sorted(Comparator.comparing((v0) -> {
+        
+        List<FileVO> collect = fileVOIPage.getRecords().stream().sorted(Comparator.comparing(FileVO::getFileType).thenComparing(Comparator.comparing(FileVO::getUpdateTime).reversed())).collect(Collectors.toList());
+        /*
+        List<FileVO> collect1 = fileVOIPage.getRecords().stream().sorted(Comparator.comparing((v0) -> {
             return v0.getFileType();
         }).thenComparing(Comparator.comparing((v0) -> {
             return v0.getUpdateTime();
-        }).reversed())).collect(Collectors.toList());
+        }).reversed())).collect(Collectors.toList());*/
         fileVOIPage.setRecords(collect);
         return fileVOIPage;
     }
@@ -1150,7 +746,7 @@
                 suffixList.add(s.toUpperCase());
                 suffixList.add(s.toLowerCase());
             }
-            return (List) suffixList.stream().distinct().collect(Collectors.toList());
+            return suffixList.stream().distinct().collect(Collectors.toList());
         }
         return suffixList;
     }
@@ -1162,21 +758,32 @@
         boolean result = false;
         String noSuffix = "";
         if (DncEnums.FileType.PROCESSING_PROGRAM.getCode().equals(fileType)) {
-            List<String> suffix2 = getSuffix();
+        	suffix = getSuffix();
             result = true;
+            List<String> collect = suffix.stream().filter(CommonConstant.NOT_SUFFIX::equals).collect(Collectors.toList());
+            /*
             List<String> collect = (List) suffix2.stream().filter((v1) -> {
                 return r1.equals(v1);
-            }).collect(Collectors.toList());
+            }).collect(Collectors.toList());*/
             if (collect.size() > 0) {
                 noSuffix = CommonConstant.NOT_SUFFIX;
             }
-            suffix = (List) suffix2.stream().filter(s -> {
+            suffix = suffix.stream().filter(s -> !CommonConstant.NOT_SUFFIX.equals(s)).collect(Collectors.toList());
+            /*
+            suffix = suffix2.stream().filter(s -> {
                 return !CommonConstant.NOT_SUFFIX.equals(s);
-            }).collect(Collectors.toList());
+            }).collect(Collectors.toList());*/
         }
         String parentName = getParentName(parent);
         List<String> finalSuffix = suffix;
         String finalNoSuffix = noSuffix;
+        LambdaQueryWrapper<File> wrapper = Wrappers.<File>query().lambda()
+        		.eq(File::getOwner, userId).eq(File::getIsCurrent, Boolean.valueOf(true))
+				.eq(File::getFileType, Integer.valueOf(FileType.FILE.getValue()))
+				.and(result, i -> i.in(File::getSuffix, finalSuffix).or().eq(Func.isNotBlank(finalNoSuffix), File::getSuffix, ""))
+				.and(Func.isNotBlank(searchKey), s -> s.likeRight(File::getDisplayName, searchKey).or().likeRight(File::getSuffix, searchKey))
+				.orderByDesc(File::getUpdateTime);
+        /*
         Wrapper wrapper = (LambdaQueryWrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) Wrappers.query().lambda().eq((v0) -> {
             return v0.getOwner();
         }, userId)).eq((v0) -> {
@@ -1197,11 +804,13 @@
             }, searchKey);
         }).orderByDesc((v0) -> {
             return v0.getUpdateTime();
-        });
+        });*/
         if (parent != null) {
+        	wrapper.eq(File::getParentId, parent); 
+        	/*
             wrapper = (LambdaQueryWrapper) wrapper.eq((v0) -> {
                 return v0.getParentId();
-            }, parent);
+            }, parent);*/
         }
         IPage<File> page = page(Condition.getPage(query), wrapper);
         IPage<FileVO> fileVOIPage = FileConvert.INSTANCE.pageConvert(page);
@@ -1232,11 +841,14 @@
             }
             String fromPath = "";
             if (Func.isNotEmpty(ids)) {
+            	 fromPath = list(Wrappers.<File>lambdaQuery().in(File::getId, ids)).stream().map(File::getDisplayName).collect(Collectors.joining("/")); 
+            	/*
                 fromPath = (String) list((Wrapper) Wrappers.lambdaQuery().in((v0) -> {
                     return v0.getId();
                 }, ids)).stream().map((v0) -> {
                     return v0.getDisplayName();
                 }).collect(Collectors.joining("/"));
+                */
             }
             fileSourcePathVO.setAllPathId(allPath);
             fileSourcePathVO.setAllPathName(fromPath);
@@ -1249,13 +861,17 @@
         List<File> fileList = new ArrayList<>();
         deleteFileVO.getSourceIdList().forEach(id -> {
             File directory = (File) getById(id);
+            List<File> list = list(Wrappers.<File>lambdaQuery().likeRight(File::getAllPath, directory.getAllPath())
+            		.eq(File::getFileType, Integer.valueOf(FileType.FILE.getValue()))
+            		.eq(File::getIsCurrent, Boolean.TRUE));
+            /*
             List<File> list = list((Wrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().likeRight((v0) -> {
                 return v0.getAllPath();
             }, directory.getAllPath())).eq((v0) -> {
                 return v0.getFileType();
             }, Integer.valueOf(FileType.FILE.getValue()))).eq((v0) -> {
                 return v0.getIsCurrent();
-            }, Boolean.TRUE));
+            }, Boolean.TRUE));*/
             if (Func.isNotEmpty(list)) {
                 fileList.addAll(list);
             }

--
Gitblit v1.9.3