From 5cda757ab7f7a599c1d4941e2d548d80f0cc78d7 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Mon, 11 Dec 2023 10:20:27 +0800
Subject: [PATCH] =?UTF-8?q?style:=20=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/LawsCommonServiceImpl.java   | 27 ++-----------------
 1 file changed, 2 insertions(+), 25 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java
index f603e409..2d73f96b 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java
@@ -1872,9 +1872,7 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
         StringBuilder selectCondition = new StringBuilder("where 1 = 1");
         // 拼接多表关联查询条件
         Set<String> idSet = new HashSet<>();
-        Set<String> standNoSet = new HashSet<>();
         boolean idSearch = false;
-        boolean standNoSearch = false;
         // 企标独有权限
         if (module.equals(TableNameEnum.ENTERPRISE_STANDARDS.getValue())) {
             // 授权部门
@@ -1902,14 +1900,8 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
         }
         // 代替标准号
         String replaceStandard =  (String) parameterMap.get(FieldCommon.REPLACED_STANDARD);
-        LambdaQueryWrapper<LawsReplacedStandard> replaceWrapper = new LambdaQueryWrapper<>();
         if (StrUtil.isNotBlank(replaceStandard)) {
-//            standNoSearch = true;
             List<String> standardNo = Arrays.asList(replaceStandard.split(","));
-//            standardNo.forEach(s -> replaceWrapper.like(LawsReplacedStandard::getReplaced, s));
-//            standardNo.forEach(s -> replaceWrapper.eq(LawsReplacedStandard::getType, 1));
-//            List<LawsReplacedStandard> replaceList = lawsReplacedStandardService.list(replaceWrapper);
-//            standNoSet.addAll(replaceList.stream().map(LawsReplacedStandard::getReplacedBy).collect(Collectors.toSet()));
             String sql = getLawsReplacedStandardSql(tableName, standardNo, " replaced ", "1");
             selectCondition.append(sql);
             parameterMap.remove(FieldCommon.REPLACED_STANDARD);
@@ -1917,38 +1909,23 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
         // 被代替标准号
         String replacedByStandard =  (String) parameterMap.get(FieldCommon.REPLACED_BY_STANDARD);
         if (StrUtil.isNotBlank(replacedByStandard)) {
-//            standNoSearch = true;
             List<String> standardNo = Arrays.asList(replacedByStandard.split(","));
-//            standardNo.forEach(s -> replaceWrapper.like(LawsReplacedStandard::getReplacedBy, s));
-//            standardNo.forEach(s -> replaceWrapper.eq(LawsReplacedStandard::getType, 1));
-//            List<LawsReplacedStandard> replaceList = lawsReplacedStandardService.list(replaceWrapper);
-//            standNoSet.addAll(replaceList.stream().map(LawsReplacedStandard::getReplaced).collect(Collectors.toSet()));
-            String sql = getLawsReplacedStandardSql(tableName, standardNo, " replaced_by ", "2");
+            String sql = getLawsReplacedStandardSql(tableName, standardNo, " replaced_by ", "1");
             selectCondition.append(sql);
             parameterMap.remove(FieldCommon.REPLACED_BY_STANDARD);
         }
         // 引用标准号
         String referenceStandard =  (String) parameterMap.get(FieldCommon.REFERENCE_STANDARD);
         if (StrUtil.isNotBlank(referenceStandard)) {
-//            standNoSearch = true;
             List<String> standardNo = Arrays.asList(referenceStandard.split(","));
-//            standardNo.forEach(s -> replaceWrapper.like(LawsReplacedStandard::getReplaced, s));
-//            standardNo.forEach(s -> replaceWrapper.eq(LawsReplacedStandard::getType, 2));
-//            List<LawsReplacedStandard> replaceList = lawsReplacedStandardService.list(replaceWrapper);
-//            standNoSet.addAll(replaceList.stream().map(LawsReplacedStandard::getReplacedBy).collect(Collectors.toSet()));
-            String sql = getLawsReplacedStandardSql(tableName, standardNo, " replaced ", "1");
+            String sql = getLawsReplacedStandardSql(tableName, standardNo, " replaced ", "2");
             selectCondition.append(sql);
             parameterMap.remove(FieldCommon.REFERENCE_STANDARD);
         }
         // 被引用标准号
         String referencedStandard =  (String) parameterMap.get(FieldCommon.REFERENCED_STANDARD);
         if (StrUtil.isNotBlank(referencedStandard)) {
-//            standNoSearch = true;
             List<String> standardNo = Arrays.asList(referencedStandard.split(","));
-//            standardNo.forEach(s -> replaceWrapper.like(LawsReplacedStandard::getReplacedBy, s));
-//            standardNo.forEach(s -> replaceWrapper.eq(LawsReplacedStandard::getType, 2));
-//            List<LawsReplacedStandard> replaceList = lawsReplacedStandardService.list(replaceWrapper);
-//            standNoSet.addAll(replaceList.stream().map(LawsReplacedStandard::getReplaced).collect(Collectors.toSet()));
             String sql = getLawsReplacedStandardSql(tableName, standardNo, " replaced_by ", "2");
             selectCondition.append(sql);
             parameterMap.remove(FieldCommon.REFERENCED_STANDARD);