From b859379639c71b5f24f0754ccd680f624f3c6622 Mon Sep 17 00:00:00 2001
From: wxyclub <tjzdwxy@163.com>
Date: Thu, 30 Nov 2023 09:31:33 +0800
Subject: [PATCH] =?UTF-8?q?bug:=20=E6=94=BF=E7=AD=96=E6=B3=95=E8=A7=84?=
 =?UTF-8?q?=E8=B5=84=E6=96=99=E5=AF=BC=E5=87=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/SarLawsInformationController.java      |  7 +++++--
 .../service/SarLawsInformationService.java            |  2 +-
 .../service/impl/SarLawsInformationServiceImpl.java   |  3 +--
 .../service/impl/SarLawsTopicServiceImpl.java         | 11 -----------
 4 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/controller/SarLawsInformationController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/controller/SarLawsInformationController.java
index 0dd2c655..4d7499ac 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/controller/SarLawsInformationController.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/controller/SarLawsInformationController.java
@@ -107,7 +107,7 @@ public class SarLawsInformationController extends BaseController<SarLawsInformat
 
     @ApiOperation("导出政策法规资料信息")
     @GetMapping("/exportLawsInformationInfo")
-    public ResponseMessage<?> exportLawsInformationInfo(SarLawsInformation sarLawsInformation, HttpServletResponse response,
+    public ResponseMessage<?> exportLawsInformationInfo(SarLawsInformation sarLawsInformation, String userId, HttpServletResponse response,
                                                 HttpServletRequest request) {
         OutputStream os = null;
         Workbook workbook = null;
@@ -119,13 +119,16 @@ public class SarLawsInformationController extends BaseController<SarLawsInformat
             response.setHeader("Content-Disposition",
                     "attachment; filename=" + ReadExcel.encodeFileName(sarLawsInformation.getExportName()+".xlsx",
                             request));
+            if (StringUtils.isBlank(userId)) {
+                return Result.error("导出失败，用户ID为空");
+            }
             // 导出数据，若指定了值则使用ids字段条件导出，否则根据条件导出
             if (StrUtil.isNotBlank(sarLawsInformation.getExportIds())) {
                 List<String> idList = Arrays.asList(sarLawsInformation.getExportIds().split(","));
                 datas = informationService.getLawsInformationByIds(idList);
             } else {
                 // 导出所有数据
-                datas = informationService.getAllLawsInformation(sarLawsInformation);
+                datas = informationService.getAllLawsInformation(sarLawsInformation, userId);
             }
             List<SarLawsInformationExport> datasExport = new ArrayList<>();
             for (SarLawsInformation data : datas) {
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/service/SarLawsInformationService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/service/SarLawsInformationService.java
index a338297f..21a94931 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/service/SarLawsInformationService.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/service/SarLawsInformationService.java
@@ -36,7 +36,7 @@ public interface SarLawsInformationService extends IService<SarLawsInformation>
      * @param sarLawsInformation 法规资料对象，用于查询
      * @return 法规资料列表
      */
-    List<SarLawsInformation> getAllLawsInformation(SarLawsInformation sarLawsInformation);
+    List<SarLawsInformation> getAllLawsInformation(SarLawsInformation sarLawsInformation, String userId);
 
     ResponseMessage<?> importLawsInformationInfo(MultipartFile file);
 }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/service/impl/SarLawsInformationServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/service/impl/SarLawsInformationServiceImpl.java
index 54c4be20..9fbfa59f 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/service/impl/SarLawsInformationServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/service/impl/SarLawsInformationServiceImpl.java
@@ -355,8 +355,7 @@ public class SarLawsInformationServiceImpl extends ServiceImpl<SarLawsInformatio
     }
 
     @Override
-    public List<SarLawsInformation> getAllLawsInformation(SarLawsInformation sarLawsInformation) {
-        String userId = LoginUserUtil.getUserId();
+    public List<SarLawsInformation> getAllLawsInformation(SarLawsInformation sarLawsInformation, String userId) {
         // 查询有权限的资料ID
         LambdaQueryWrapper<SarLawsInformationAuth> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(SarLawsInformationAuth::getUserId, userId);
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/service/impl/SarLawsTopicServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/service/impl/SarLawsTopicServiceImpl.java
index fdf09eb5..17d66f71 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/service/impl/SarLawsTopicServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/service/impl/SarLawsTopicServiceImpl.java
@@ -156,22 +156,11 @@ public class SarLawsTopicServiceImpl extends ServiceImpl<SarLawsTopicMapper, Sar
             return false;
         }
         SarLawsTopic lawsTopicInfoDB = getLawsTopicInfo(lawsTopic.getId());
-        log.error("====================新的================" + sdf.format(lawsTopic.getStartTime()));
-        log.error("====================旧的================" + sdf.format(lawsTopicInfoDB.getStartTime()));
-        if (lawsTopic.getCloseTime()!= null) {
-            log.error("====================新的================" + sdf.format(lawsTopic.getCloseTime()));
-        }
-        if (lawsTopicInfoDB.getCloseTime() != null) {
-            log.error("====================旧的================" + sdf.format(lawsTopicInfoDB.getCloseTime()));
-        }
         List<String> compareList = compareLawsTopic(lawsTopicInfoDB, lawsTopic);
         if (compareLawsTopic(lawsTopicInfoDB, lawsTopic).size() == 0) {
             return true;
         }
         lawsTopic.setModifyTime(new Date());
-        for (String s : compareList) {
-            log.error("====================变更项====================" + s);
-        }
         int update = this.baseMapper.updateById(lawsTopic);
         // 比较列表字段是否经过修改，如果经过修改，先删除，再添加
         if (compareList.contains("课题组会议列表被变更")) {