From 86dca29a445c56ff730de7d4cffc5577a2ec67ac Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Mon, 14 Oct 2024 16:00:40 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=9C=A8=E6=9F=A5=E8=AF=A2=E4=B8=AD?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=93=E4=B8=9A=E5=8C=96=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=E7=AD=9B=E9=80=89=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在LawsConformityAssessmentLibraryServiceImpl和LawsEvaluationNotMetLibraryServiceImpl中，分别为conformity和non-conformity查询添加了专业化模块（specialized_module）的筛选条件。
- 这个修改使得用户可以根据专业化模块进行更精确的查询，提高了系统的筛选功能和用户体验。
---
 .../impl/LawsConformityAssessmentLibraryServiceImpl.java        | 2 ++
 .../service/impl/LawsEvaluationNotMetLibraryServiceImpl.java    | 2 ++
 2 files changed, 4 insertions(+)

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 c4e81b6e..e4b802ad 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
@@ -132,6 +132,8 @@ public class LawsConformityAssessmentLibraryServiceImpl extends ServiceImpl<Laws
                 "model", lawsConformityAssessmentLibraryDetail.getModel());
         queryWrapper.eq(StringUtils.isNotBlank(lawsConformityAssessmentLibraryDetail.getResult()),
                 "result", lawsConformityAssessmentLibraryDetail.getResult());
+        queryWrapper.eq(StringUtils.isNotBlank(lawsConformityAssessmentLibraryDetail.getSpecializedModule()),
+                "specialized_module", lawsConformityAssessmentLibraryDetail.getSpecializedModule());
         if (StringUtils.isNotBlank(lawsConformityAssessmentLibraryDetail.getAuthDept())) {
             queryWrapper.in("auth_dept", Arrays.asList(lawsConformityAssessmentLibraryDetail.getAuthDept().split(",")));
         }
diff --git a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsEvaluationNotMetLibraryServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsEvaluationNotMetLibraryServiceImpl.java
index fc22a051..3d3b71f6 100644
--- a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsEvaluationNotMetLibraryServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsEvaluationNotMetLibraryServiceImpl.java
@@ -79,6 +79,8 @@ public class LawsEvaluationNotMetLibraryServiceImpl extends ServiceImpl<LawsEval
         }
         queryWrapper.eq(StringUtils.isNotBlank(lawsEvaluationNotMet.getRectifyStatus()),
                 "nm.rectify_status", lawsEvaluationNotMet.getRectifyStatus());
+        queryWrapper.eq(StringUtils.isNotBlank(lawsEvaluationNotMet.getSpecializedModule()),
+                "nm.specialized_module", lawsEvaluationNotMet.getSpecializedModule());
         queryWrapper.like(StringUtils.isNotBlank(lawsEvaluationNotMet.getPcrNo()),
                 "nm.pcr_no", lawsEvaluationNotMet.getPcrNo());
         if (StringUtils.isNotBlank(lawsEvaluationNotMet.getSelections())) {