FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop_1' into develop_1

Browse Source
This commit is contained in:
yanyizhou
2021-08-10 18:15:38 +08:00
parent 9af7f462f5 5cb1fd52cc
commit b9c6899e55
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java
+3 -1
View File
@@ -288,7 +288,9 @@ public class SearchCenterServiceImpl implements SearchCenterService {
if(json instanceof org.json.JSONArray){ if(json instanceof org.json.JSONArray){
fields = JSONObject.parseArray(collectAttrMap.get(field).toString(),String.class); fields = JSONObject.parseArray(collectAttrMap.get(field).toString(),String.class);
}else { }else {
fields.add(collectAttrMap.get(field).toString()); if(!json.equals("null")){
fields.add(collectAttrMap.get(field).toString());
}
} }
if(!fields.isEmpty()){ if(!fields.isEmpty()){
for (String str : fields) { for (String str : fields) {
adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml
-1
View File
@@ -378,7 +378,6 @@
* *
FROM FROM
sar_stand_items AS a sar_stand_items AS a
LEFT JOIN sar_interpretation_national_standard AS b ON a.STAND_ID = b.STAND_ID
<where> <where>
<if test="standId!=null and standId!=''"> <if test="standId!=null and standId!=''">