耕地保护中永久基本农田，耕地查询全部数据

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/dimentity/impl/DimEntityServiceImpl.java

@@ -160,7 +160,7 @@ public class DimEntityServiceImpl implements DimEntityService {
     public Map<String, Object> queryEntityRelationshipToNeo4j(String entityid) {
         Map<String, Object> retMap = new HashMap<>();
 //        String sql = "match (n:Entity{ entityid:'MA1001NE103K1034230XXXXXXXXXXXXX2501010009'}) <-[r]->(b:Entity)  return b.entityid, type(r)";
-        String sql = "match (n:Entity{ entityid:'" + entityid + "'}) <-[r]->(b:Entity)  " + "return n.entityid as source,  n.entilayer as entilayer, " + " b.entityid as target,  b.entilayer as comilayer,  " + "type(r) as value";
+        String sql = "match (n:Entity{ entityid:'" + entityid + "'}) <-[r]->(b:Entity)  return n.entityid as source,  n.entilayer as entilayer,  b.entityid as target,  b.entilayer as comilayer,  type(r) as value";
         System.out.println("cql:" + sql);
         Collection<Map<String, Object>> links = neo4jClient.query(sql).fetch().all();
         if (links.isEmpty()) {

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/gdbh/impl/TGdbhYjjbntServiceImpl.java

@@ -88,6 +88,9 @@ public class TGdbhYjjbntServiceImpl implements ITGdbhYjjbntService {
         if (d1 == null || d1.size() == 0) {
             return null;
         }
+        if (StringUtils.isEmpty(dlbm) || "01".equals(dlbm)) {
+            dlbm = null;
+        }
         TGdbhYjjbntServerDTO d2 = d1.get(0);
         String areacolumn = d2.getAreaColumn();
         String sjy = d2.getSjy();