From cf73447a5b166daa06941417e7cae1dd23853f4b Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Fri, 13 Sep 2024 19:13:17 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E9=80=82=E7=94=A8=E5=B8=82=E5=9C=BA?=
 =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/LawsConformityAssessmentLibraryServiceImpl.java  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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 709684ee..6c3fa313 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
@@ -15,11 +15,11 @@ import com.jero.common.util.obs.ObsBootUtil;
 import com.jero.modules.assessmentLibrary.entity.LawsConformityAssessmentLibrary;
 import com.jero.modules.assessmentLibrary.entity.LawsConformityAssessmentLibraryDetail;
 import com.jero.modules.assessmentLibrary.entity.vo.LawsConformityAssessmentLibraryExportVO;
-import com.jero.modules.assessmentLibrary.entity.vo.MaterialFile;
-import com.jero.modules.assessmentLibrary.entity.vo.UnsatisfiedRequireAttachFile;
 import com.jero.modules.assessmentLibrary.mapper.LawsConformityAssessmentLibraryMapper;
 import com.jero.modules.assessmentLibrary.service.ILawsConformityAssessmentLibraryService;
 import com.jero.modules.laws.enterprise.util.BeanCopyUtils;
+import com.jero.modules.laws.utils.ExcelExportUtilPro.MaterialFile;
+import com.jero.modules.laws.utils.ExcelExportUtilPro.UnsatisfiedRequireAttachFile;
 import com.jero.modules.oss.entity.OSSFile;
 import com.jero.modules.oss.service.IOSSFileService;
 import com.jero.modules.sys.utils.UserUtils;
@@ -90,8 +90,8 @@ public class LawsConformityAssessmentLibraryServiceImpl extends ServiceImpl<Laws
         if (StringUtils.isNotBlank(applicableMarkets)) {
             String[] split = applicableMarkets.split(",");
             for (String splitStr : split) {
-                queryWrapper.likeRight("t.country", splitStr + "-").or()
-                        .apply("FIND_IN_SET({0}, t.country) > 0", splitStr);
+                queryWrapper.likeRight("t.applicable_market", splitStr + "-").or()
+                        .apply("FIND_IN_SET({0}, t.applicable_market) > 0", splitStr);
             }
         }
         if (StringUtils.isNotBlank(lawsConformityAssessmentLibrary.getSelections())) {