QR/laws_chery_serve
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

高级检索条款适用市场条件添加已发布条件

Browse Source
This commit is contained in:
梁琦涛
2024-09-19 14:11:25 +08:00
parent 84ba3accc9
commit c66ecc84de
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/xml/DocumentSplitMapper.xml
+1 -1
View File
@@ -320,7 +320,7 @@
<select id="getSplitSelectIds" resultType="java.lang.String"> <select id="getSplitSelectIds" resultType="java.lang.String">
select l2.id from laws_domestic_standard l1 select l2.id from laws_domestic_standard l1
left join sar_file_split_info l2 on l1.id = l2.standard_id and l2.del_flag = 0 left join sar_file_split_info l2 on l1.id = l2.standard_id and l2.del_flag = 0
where l1.del_flag = 0 and l2.id is not null where l1.del_flag = 0 and l2.id is not null and split_status = 2
and and
<foreach collection="countryList" separator="or" item= "item" open="(" close=")"> <foreach collection="countryList" separator="or" item= "item" open="(" close=")">
CONCAT(',',l1.applicable_market,',') like CONCAT('%,',#{item},',%') CONCAT(',',l1.applicable_market,',') like CONCAT('%,',#{item},',%')
laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java
+5 -3
View File
@@ -1879,10 +1879,12 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService {
// 查询市场下的标准 // 查询市场下的标准
List<String> countryList = Arrays.asList(parameter.get(COUNTRY).toString().split(",")); List<String> countryList = Arrays.asList(parameter.get(COUNTRY).toString().split(","));
List<String> ids = documentSplitMapper.getSplitSelectIds(countryList); List<String> ids = documentSplitMapper.getSplitSelectIds(countryList);
if(!CollectionUtils.isEmpty(ids)){ if(CollectionUtils.isEmpty(ids)){
// in查询 ids = new ArrayList<>();
selectCondition.append(" and s.info_id" + " in('").append(String.join("','",ids)).append("')"); ids.add("-1");
} }
// in查询
selectCondition.append(" and s.info_id" + " in('").append(String.join("','",ids)).append("')");
parameter.remove(COUNTRY); parameter.remove(COUNTRY);
} }
} }