From 5ef7dff78cc31fe1233efb9c549f393dc6e5593e Mon Sep 17 00:00:00 2001
From: wxyclub <tjzdwxy@163.com>
Date: Thu, 26 Oct 2023 18:04:08 +0800
Subject: [PATCH] =?UTF-8?q?bug=EF=BC=9A=E6=94=BF=E7=AD=96=E8=B5=84?=
 =?UTF-8?q?=E6=96=99=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/SarLawsInformationServiceImpl.java      | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

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 92207144..d0ee784d 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
@@ -69,8 +69,7 @@ public class SarLawsInformationServiceImpl extends ServiceImpl<SarLawsInformatio
         // 查询是否被收藏
         LambdaQueryWrapper<TsPersonCollect> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(TsPersonCollect::getCollectResId, sarLawsInformation.getId());
-        wrapper.eq(TsPersonCollect::getValidFlag, 0);
-        List<TsPersonCollect> list = collectEOService.list();
+        List<TsPersonCollect> list = collectEOService.list(wrapper);
         if (list.size() > 0) {
             sarLawsInformation.setCollectId(list.get(0).getId());
         }
@@ -213,7 +212,7 @@ public class SarLawsInformationServiceImpl extends ServiceImpl<SarLawsInformatio
                             String fieldName = field.getName().substring(0, 1).toUpperCase() + field.getName().substring(1);
                             Method method = SarLawsInformation.class.getMethod("get" + fieldName + "Name");
                             Object oldTypeName = method.invoke(oldInfo);
-                            changes.add("\"" + field.getName() + "\"由\"" + oldTypeName + "\"\"改为\"\"" + String.join(",",typeNameList) + "\"");
+                            changes.add("\"" + field.getName() + "\"由\"" + oldTypeName + "\"改为\"" + String.join(",",typeNameList) + "\"");
                         } else if ("informationFile".equals(field.getName())) {
                             List<String> fileNameList = new ArrayList<>();
                             if (StringUtils.isNotBlank(newValue)) {
@@ -227,10 +226,10 @@ public class SarLawsInformationServiceImpl extends ServiceImpl<SarLawsInformatio
                             String fieldName = field.getName().substring(0, 1).toUpperCase() + field.getName().substring(1);
                             Method method = SarLawsInformation.class.getMethod("get" + fieldName + "Name");
                             Object oldTypeName = method.invoke(oldInfo);
-                            changes.add(field.getName() + "由\"" + oldTypeName + "\"\"改为\"\"" + String.join(",",fileNameList) + "\"");
+                            changes.add(field.getName() + "由\"" + oldTypeName + "\"改为\"" + String.join(",",fileNameList) + "\"");
                         }
                         else {
-                            changes.add("\"" + field.getName() + "\"由\"" + oldValue + "\"\"改为\"\"" + newValue + "\"");
+                            changes.add("\"" + field.getName() + "\"由\"" + oldValue + "\"改为\"" + newValue + "\"");
                         }
                     }
                 } catch (IllegalAccessException | NoSuchMethodException | InvocationTargetException e) {