From 862120ce1b3b73329665c9170cb3eb1254d5e7c1 Mon Sep 17 00:00:00 2001
From: gaosong <gaosong@syxysoft.com>
Date: Wed, 10 Aug 2022 23:32:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=B9=E5=A4=96=E6=8A=A5?=
 =?UTF-8?q?=E5=91=8A-=E4=BF=AE=E6=94=B9=E6=9C=80=E5=90=8E=E4=B8=80?=
 =?UTF-8?q?=E4=B8=AA=E4=B8=80=E7=BA=A7=E6=96=87=E4=BB=B6=E5=A4=B9=E4=B8=8D?=
 =?UTF-8?q?=E8=83=BD=E5=88=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ExtRepoDataController.java     | 40 +++++++++++++------
 1 file changed, 27 insertions(+), 13 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoDataController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoDataController.java
index 8d06ee3b3..c459fcc97 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoDataController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoDataController.java
@@ -9,12 +9,11 @@ import com.jero.common.constant.enums.CutEnum;
 import com.jero.common.system.base.controller.JeroController;
 import com.jero.common.system.vo.LoginUser;
 import com.jero.common.util.oss.CosBootUtil;
-import com.jero.generater.modules.online.auth.entity.OnlAuthData;
 import com.jero.modules.extRepo.entity.ExtRepoData;
 import com.jero.modules.extRepo.entity.ExtRepoDataPage;
+import com.jero.modules.extRepo.entity.ExtRepoFolder;
 import com.jero.modules.extRepo.service.IExtRepoDataService;
 import com.jero.modules.extRepo.service.IExtRepoFolderService;
-import com.jero.modules.split.entity.SarFileSplitInfoEO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -74,13 +73,13 @@ public class ExtRepoDataController extends JeroController<ExtRepoData, IExtRepoD
         // 文件名称模糊查询
         String fileName = req.getParameter("fileName");
         if (StringUtils.isNotBlank(fileName)) {
-            fileName = fileName.replace("%","\\%");
+            fileName = fileName.replace("%", "\\%");
             queryWrapper.like(ExtRepoData::getFileName, fileName);
         }
         // 上传人模糊查询
         String createBy = req.getParameter("createBy");
         if (StringUtils.isNotBlank(createBy)) {
-            createBy = createBy.replace("%","\\%");
+            createBy = createBy.replace("%", "\\%");
             queryWrapper.like(ExtRepoData::getCreateBy, createBy);
         }
         // 更新时间查询
@@ -186,20 +185,29 @@ public class ExtRepoDataController extends JeroController<ExtRepoData, IExtRepoD
         Result<ExtRepoData> result = new Result();
         ExtRepoData erd = extRepoDataService.queryById(id);
         if (null != erd) {
-            LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-            if (sysUser.getUsername().equals(erd.getCreateBy())) {
-                extRepoDataService.deleteById(id);
-                CosBootUtil.delete(erd.getFileKey());
+            int count = getRootFolderCount();
+            if (erd.getSupFolder().equals("root") && count <= 1) {
                 if (CutEnum.CN.getValue().equals(cut)) {
-                    result.success("删除成功!");
+                    result.error500("此文件夹不可删除！");
                 } else {
-                    result.success("Data deletion successfully!");
+                    result.error500("This folder cannot be deleted!");
                 }
             } else {
-                if (CutEnum.CN.getValue().equals(cut)) {
-                    result.error500("没有权限！");
+                LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+                if (sysUser.getUsername().equals(erd.getCreateBy())) {
+                    extRepoDataService.deleteById(id);
+                    CosBootUtil.delete(erd.getFileKey());
+                    if (CutEnum.CN.getValue().equals(cut)) {
+                        result.success("删除成功!");
+                    } else {
+                        result.success("Data deletion successfully!");
+                    }
                 } else {
-                    result.error500("You do not have permission!");
+                    if (CutEnum.CN.getValue().equals(cut)) {
+                        result.error500("没有权限！");
+                    } else {
+                        result.error500("You do not have permission!");
+                    }
                 }
             }
         } else {
@@ -212,6 +220,12 @@ public class ExtRepoDataController extends JeroController<ExtRepoData, IExtRepoD
         return result;
     }
 
+    private int getRootFolderCount() {
+        LambdaQueryWrapper<ExtRepoFolder> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(ExtRepoFolder::getSupFolder, "root");
+        return extRepoFolderService.count(queryWrapper);
+    }
+
     /**
      * 批量删除
      *