diff --git a/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java b/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java index fa4f21b3..88bf234f 100644 --- a/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java +++ b/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java @@ -288,7 +288,9 @@ public class SearchCenterServiceImpl implements SearchCenterService { if(json instanceof org.json.JSONArray){ fields = JSONObject.parseArray(collectAttrMap.get(field).toString(),String.class); }else { - fields.add(collectAttrMap.get(field).toString()); + if(!json.equals("null")){ + fields.add(collectAttrMap.get(field).toString()); + } } if(!fields.isEmpty()){ for (String str : fields) { diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml index cf8e97c6..f66c5ee1 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml @@ -378,7 +378,6 @@ * FROM sar_stand_items AS a - LEFT JOIN sar_interpretation_national_standard AS b ON a.STAND_ID = b.STAND_ID