From efde5d280858b45d3e9a95984401a38fd4aa0818 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Sat, 29 Jun 2024 10:33:35 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B3=95=E8=A7=84=E5=90=88=E8=A7=84?=
 =?UTF-8?q?=E8=AF=84=E4=BC=B0=E5=BA=93=E5=AF=BC=E5=87=BA=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E9=80=89=E4=B8=AD=E6=8C=87=E5=AE=9A=E6=95=B0=E6=8D=AE=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/LawsConformityAssessmentLibrary.java               | 4 ++++
 .../impl/LawsConformityAssessmentLibraryServiceImpl.java      | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/LawsConformityAssessmentLibrary.java b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/LawsConformityAssessmentLibrary.java
index cf72a167..e9a8726f 100644
--- a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/LawsConformityAssessmentLibrary.java
+++ b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/LawsConformityAssessmentLibrary.java
@@ -84,6 +84,10 @@ public class LawsConformityAssessmentLibrary implements Serializable {
     @Dict(dicCode = "market_state")
     private String applicableMarket;
 
+    @TableField(exist = false)
+    @ApiModelProperty(value = "多选用字段，逗号拼接")
+    private String ids;
+
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
 }
\ No newline at end of file
diff --git a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsConformityAssessmentLibraryServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsConformityAssessmentLibraryServiceImpl.java
index c4f9c8eb..8a8343c0 100644
--- a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsConformityAssessmentLibraryServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsConformityAssessmentLibraryServiceImpl.java
@@ -78,6 +78,9 @@ public class LawsConformityAssessmentLibraryServiceImpl extends ServiceImpl<Laws
         if (StringUtils.isNotBlank(lawsConformityAssessmentLibrary.getApplicableMarket())) {
             queryWrapper.in("d.applicable_market", Arrays.asList(lawsConformityAssessmentLibrary.getApplicableMarket().split(",")));
         }
+        if (StringUtils.isNotBlank(lawsConformityAssessmentLibrary.getIds())) {
+            queryWrapper.in("cs.id", Arrays.asList(lawsConformityAssessmentLibrary.getIds().split(",")));
+        }
         queryWrapper.between(lawsConformityAssessmentLibrary.getValuationTime() != null,
                 "valuation_time", lawsConformityAssessmentLibrary.getStartValuationTime(), lawsConformityAssessmentLibrary.getEndValuationTime());
         queryWrapper.orderByDesc("cs.create_time");