Merge branch 'f-xiaogu' into dev

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/service/impl/FzssServiceImpl.java

@@ -559,12 +559,12 @@ public class FzssServiceImpl implements IFzssService {
             Map<String, Object> dkMap = new HashMap<>();
             float originValue = 999;
             for (Map<String, Object> rawTable : rawTables) {
-                String dkbm = (String) dkMap.get("dkbm");
-                dkbm=rawTable.equals("null")?"":dkbm;
+                String dkbm = (String) rawTable.get("dkbm");
+                dkbm = dkbm == null ? "无" : dkbm;
                 if (dkMap.containsKey("dkbm")) {
                     dkMap.put("dkbm", dkMap.get("dkbm") + "," + dkbm);// 地块编码
                 } else {
-                    dkMap.put("dkbm",dkbm);// 地块编码
+                    dkMap.put("dkbm", dkbm);// 地块编码
                 }
                 if (dkMap.containsKey("kzxxgydmc")) {
                     dkMap.put("kzxxgydmc", dkMap.get("kzxxgydmc") + "," + rawTable.get("kzxxgydmc"));// 地块类型
@@ -578,7 +578,7 @@ public class FzssServiceImpl implements IFzssService {
                 }
             }
 
-            dkMap.put("jzxgd", originValue==999?0:originValue);// 限高
+            dkMap.put("jzxgd", originValue == 999 ? 0 : originValue);// 限高
             dkMap.put("landPrice", NumberUtil.double2TwoDecimal(selectionRes.getLandPrice()));// 地价
             dkMap.put("geom", selectionRes.getGeom());
             dkMap.put("id", selectionRes.getBsm());