From 5ef53dfc82ed44b76844fd20a6fdbbf6683d5e30 Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Tue, 22 Mar 2022 09:18:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=A1=A3=E6=8B=86=E5=88=86=E8=A1=A8?=
 =?UTF-8?q?=EF=BC=8C=E6=96=87=E6=A1=A3=E6=8B=86=E5=88=86=E6=9D=A1=E6=AC=BE?=
 =?UTF-8?q?=E7=9B=AE=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/SarFileSplitItemsEOController.java      | 10 +++++-----
 .../split/controller/SarFileSplitMenuEOController.java |  3 ++-
 .../service/impl/SarFileSplitMenuEOServiceImpl.java    |  4 ++--
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitItemsEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitItemsEOController.java
index a16a26eb9..71b8ca66a 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitItemsEOController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitItemsEOController.java
@@ -133,7 +133,7 @@ public class SarFileSplitItemsEOController extends JeroController<SarFileSplitIt
 //        return Result.OK(sarFileSplitItemsEOService.selectByPrimaryKey(id));
 //    }
 
-    @ApiOperation(value = "文档拆分条款信息-新增")
+    @ApiOperation(value = "文档拆分条款信息-新增Y")
     @PostMapping("/addSplitItems")
     public Result<?> create(@RequestBody SarFileSplitItemsEO sarFileSplitItemsEO) throws Exception {
         if(CollectionUtils.isNotEmpty(sarFileSplitItemsEO.getItemValEOList())) {
@@ -213,7 +213,7 @@ public class SarFileSplitItemsEOController extends JeroController<SarFileSplitIt
 //        return Result.OK();
 //    }
 
-    @ApiOperation(value = "文档拆分条款信息-批量删除")
+    @ApiOperation(value = "文档拆分条款信息-批量删除Y")
     @PostMapping("/batchDeleteItems")
     public Result batchDeleteItems(String ids) throws Exception {
         if (StringUtils.isNotEmpty(ids)) {
@@ -285,7 +285,7 @@ public class SarFileSplitItemsEOController extends JeroController<SarFileSplitIt
         return Result.OK(sarFileSplitItemsEO);
     }
 
-    @ApiOperation(value = "文档拆分条款信息-判断包含子节点")
+    @ApiOperation(value = "文档拆分条款信息-判断包含子节点Y")
     @GetMapping("/judgeContaintChilds")
     /*@RequiresPermissions("lawss:sarMenu:judgequeryMenuByPid")*/
     public Result<Map<String, Object>> judgeContaintChilds(String ids) throws Exception {
@@ -293,7 +293,7 @@ public class SarFileSplitItemsEOController extends JeroController<SarFileSplitIt
         return Result.OK(result);
     }
 
-    @ApiOperation(value = "文档拆分条款信息-导出zip")
+    @ApiOperation(value = "文档拆分条款信息-导出zipY")
     @GetMapping(value = "/exportSplitInfoZip")
     public void exportSplitInfoZip(String idList, String infoId,String exportName, HttpServletResponse response, HttpServletRequest request) throws Exception {
         OutputStream os = null;
@@ -590,7 +590,7 @@ public class SarFileSplitItemsEOController extends JeroController<SarFileSplitIt
         }
     }
 
-    @ApiOperation(value = "文档拆分条款信息-导入")
+    @ApiOperation(value = "文档拆分条款信息-导入Y")
     @PostMapping(value = "/importSplitItemsZip")
     public Result<?> importSplitItemsZip(@RequestParam(value = "file", required = false) MultipartFile file,
                                                                     @RequestParam(value = "menuId", required = false) String menuId,
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitMenuEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitMenuEOController.java
index cc1ea519f..2a369baf2 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitMenuEOController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitMenuEOController.java
@@ -116,7 +116,7 @@ public class SarFileSplitMenuEOController extends JeroController<SarFileSplitMen
         return Result.OK("复制成功",sarFileSplitItemsEO);
     }
 
-    @ApiOperation(value = "文档拆分条款目录-批量复制节点不包括子节点")
+    @ApiOperation(value = "文档拆分条款目录-批量复制节点不包括子节点Y")
     @PostMapping("/copyMenuNotChildrenall")
     public Result<List<SarFileSplitItemsEO>> copyMenuNotChildrenall(@RequestParam(value = "ids",required = false) String ids,
                                                                              @RequestParam(value = "menuids",required = false) String menuids,
@@ -142,6 +142,7 @@ public class SarFileSplitMenuEOController extends JeroController<SarFileSplitMen
             sarFileSplitItemsEO.setMenuId(menuidslist.get(i));
             sarFileSplitItemsEO.setInfoId(infoIdslist.get(i));
             int result = sarFileSplitMenuEOService.copyMenuNotChildren(sarFileSplitItemsEO);
+            // 同时复制目录下的条款
             sarFileSplitItemsEO = sarFileSplitItemsEOMapper.selectByPrimaryKey(sarFileSplitItemsEO.getId());
             sarFileSplitItemsEOS.add(sarFileSplitItemsEO);
         }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitMenuEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitMenuEOServiceImpl.java
index eb0c1fcb0..08fb92095 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitMenuEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitMenuEOServiceImpl.java
@@ -291,8 +291,8 @@ public class SarFileSplitMenuEOServiceImpl extends ServiceImpl<SarFileSplitMenuE
             }
             for (SarFileSplitMenuEO sarFileSplitMenuEOfor : sarFileSplitMenuEOList) {
                 sarFileSplitMenuEOfor.setId(menuIdMap.get(sarFileSplitMenuEOfor.getId()).toString());
-                if (menuIdMap.containsKey(sarFileSplitMenuEOfor.getpId())){
-                    sarFileSplitMenuEOfor.setpId(menuIdMap.get(sarFileSplitMenuEOfor.getpId()).toString());
+                if (menuIdMap.containsKey(sarFileSplitMenuEOfor.getPId())){
+                    sarFileSplitMenuEOfor.setPId(menuIdMap.get(sarFileSplitMenuEOfor.getPId()).toString());
                 }
                 sarFileSplitMenuEOfor.setDisplaySeq(sarFileSplitMenuEOfor.getDisplaySeq() + sarFileSplitMenuEOList.size());
                 sarFileSplitMenuEOfor.setCreationTime(new Date());