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

2021-08-10 18:15:38 +08:00
parent 9af7f462f5 5cb1fd52cc
commit b9c6899e55
2 changed files with 3 additions and 2 deletions
@@ -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) {
@@ -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
        <where>

            <if test="standId!=null and standId!=''">