From 990b2867f40198f01a1f84b29676953d7c12512c Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Wed, 18 Sep 2024 09:37:10 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E6=8B=86=E5=88=86=E7=BB=93=E6=9E=9C?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=20=E7=9B=AE=E5=BD=95=E6=8B=96=E5=8A=A8?=
 =?UTF-8?q?=E5=90=8E=E5=88=B0=E5=8F=B3=E4=BE=A7=E6=9D=A1=E6=AC=BE=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/FileSplitItemsEOServiceImpl.java  |  5 ++++-
 .../impl/SarFileSplitMenuEOServiceImpl.java        | 14 +++++++-------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java
index 7606c490..6546c929 100644
--- a/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java
@@ -2269,6 +2269,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                                 tableHtml = tableHtml.replaceAll("style","border=\"1\" style");// 解决导入的表格没线
                                 splitTableInfo.setTableHtml(tableHtml);
                             }catch (Exception e){
+                                log.error(e.getMessage(),e);
                                 throw new JeroBootException(sheet.getSheetName() + "页签数据异常");
                             }
                             getSheetTableList.add(splitTableInfo);
@@ -2295,11 +2296,12 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                         FileUnZip.deleteDir(saveDirectory);
                         return message;
                     } catch (JeroBootException e){
+                        log.error(e.getMessage(),e);
                         //删除原上传文件
                         FileUnZip.deleteDir(saveDirectory);
                         return Result.error(1, e.getMessage());
                     }catch (NullPointerException e){
-                        log.error(e.getMessage());
+                        log.error("读取失败，请严格按照模板文件导入数据",e);
                         //删除原上传文件
                         FileUnZip.deleteDir(saveDirectory);
                         if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())){
@@ -2309,6 +2311,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                         }
                         return Result.error(1, resultMsg);
                     }catch (Exception e) {
+                        log.error(e.getMessage(),e);
                         //删除原上传文件
                         FileUnZip.deleteDir(saveDirectory);
                         return Result.error(e.getMessage());
diff --git a/laws-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitMenuEOServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitMenuEOServiceImpl.java
index cf97149a..66cc8486 100644
--- a/laws-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitMenuEOServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitMenuEOServiceImpl.java
@@ -3,6 +3,7 @@ package com.jero.modules.split.service.impl;
 import cn.hutool.core.collection.CollStreamUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.common.api.vo.Result;
 import com.jero.modules.laws.documenttool.service.IDocumentSplitService;
@@ -381,23 +382,22 @@ public class SarFileSplitMenuEOServiceImpl extends ServiceImpl<SarFileSplitMenuE
         List<String> sourceIdList = Arrays.asList(sourceIds.split(","));
         // 获取要移动到的层级的最后一个 的排序值
         List<SarFileSplitMenuEO> lastMenuList = getLastMenu(parentMenu.getId(),displaySeq,sourceIdList);
-
-        if(displaySeq == 0){
-            displaySeq = parentMenu.getDisplaySeq();
+        if (CollectionUtil.isNotEmpty(lastMenuList)){
+            displaySeq = lastMenuList.stream().map(SarFileSplitMenuEO::getDisplaySeq).min(Comparator.comparing(x -> x)).orElse(null);
         }
         // 要移动的节点所有子集（包括本身）
         List<SarFileSplitMenuEO> sarFileSplitMenuEO1List = new ArrayList<>();
-        List<String> idList = new ArrayList<>();
-        for (int i = 0; i < sourceIdList.size(); i++) {
-            String sourceId = sourceIdList.get(i);
+        for (String sourceId : sourceIdList) {
             // 要移动的节点信息
             SarFileSplitMenuEO sarFileSplitMenuEO = baseMapper.findById(sourceId);
             sarFileSplitMenuEO.setParentId(parentId);
             sarFileSplitMenuEO1List.add(sarFileSplitMenuEO);
-            idList.add(sourceId);
         }
         List<SarFileSplitMenuEO> allList = new ArrayList<>();
         getChildren(allList, sarFileSplitMenuEO1List);
+        //for (SarFileSplitMenuEO splitMenuEO : allList) {
+        //    splitMenuEO.setParentId(parentId);
+        //}
         //排除
         getChildren(allList, lastMenuList);