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 0", splitStr); + queryWrapper.likeRight("t.applicable_market", splitStr + "-").or() + .apply("FIND_IN_SET({0}, t.applicable_market) > 0", splitStr); } } if (StringUtils.isNotBlank(lawsConformityAssessmentLibrary.getSelections())) {