From 2feccaa6099c649dd4c2ddf25b5682607e4fb2ff Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Fri, 12 Apr 2024 10:59:51 +0800
Subject: [PATCH] =?UTF-8?q?ci:=20=E5=A4=96=E6=A0=87=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E8=AF=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../laws/oldSystem/controller/OldSystemController.java        | 4 ++--
 .../jero/modules/laws/oldSystem/service/OldSystemService.java | 2 +-
 .../laws/oldSystem/service/impl/OldSystemServiceImpl.java     | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/laws/oldSystem/controller/OldSystemController.java b/laws-modules/src/main/java/com/jero/modules/laws/oldSystem/controller/OldSystemController.java
index 1bf98636..9e7e8d24 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/oldSystem/controller/OldSystemController.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/oldSystem/controller/OldSystemController.java
@@ -205,8 +205,8 @@ public class OldSystemController {
     @AutoLog(value = "老法规系统-海外标准数据修复")
     @ApiOperation(value="老法规系统-海外标准数据修复", notes="老法规系统-海外标准数据修复")
     @ApiOperationSupport(order = 16)
-    public void fbDataFix(HttpServletResponse response) {
-        oldSystemService.fbDataFix(response);
+    public Result<?> fbDataFix(HttpServletResponse response) {
+        return Result.OK(oldSystemService.fbDataFix(response));
     }
 
     @GetMapping("/fbAuthDeptDataFix")
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/oldSystem/service/OldSystemService.java b/laws-modules/src/main/java/com/jero/modules/laws/oldSystem/service/OldSystemService.java
index 8fda1a76..43b31274 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/oldSystem/service/OldSystemService.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/oldSystem/service/OldSystemService.java
@@ -124,5 +124,5 @@ public interface OldSystemService {
      * 海外标准数据修复
      * @param response
      */
-    void fbDataFix(HttpServletResponse response);
+    String fbDataFix(HttpServletResponse response);
 }
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/oldSystem/service/impl/OldSystemServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/oldSystem/service/impl/OldSystemServiceImpl.java
index b705e2ae..86fd73ff 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/oldSystem/service/impl/OldSystemServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/oldSystem/service/impl/OldSystemServiceImpl.java
@@ -453,7 +453,7 @@ public class OldSystemServiceImpl implements OldSystemService {
     }
 
     @Override
-    public void fbDataFix(HttpServletResponse response) {
+    public String fbDataFix(HttpServletResponse response) {
         LambdaQueryWrapper<LawsTreeNode> treeNodeLambdaQueryWrapper = new LambdaQueryWrapper<>();
         treeNodeLambdaQueryWrapper.eq(LawsTreeNode::getNodeName, "引进标准");
         treeNodeLambdaQueryWrapper.eq(LawsTreeNode::getModuleCode, TableNameEnum.FOREIGN_REGULATIONS.getValue());
@@ -479,6 +479,7 @@ public class OldSystemServiceImpl implements OldSystemService {
             log.info("共新增{}条权限数据", esAdList.size());
             esAuthDeptService.saveBatch(esAdList);
         }
+        return "共新增" + esAdList.size() + "条权限数据";
     }
 
     private void oldSysFBDataFileDocPath(List<OldSystemImportDTO> allDatalist, List<OldSystemImportDTO> errImportList) {