耕地模块问题修改

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

@@ -215,7 +215,7 @@ public class GdbhReportServiceImpl implements GdbhReportService {
 
         Map sandiao = (Map) jgMap.get("sandiao");
         String v_mx_bsmmc_0 = (String) sandiao.get("mx_bsmmc");
-        NpoiHelper.content(document, v_mx_bsmmc_0 + "; 分析结果如下:", pos++,  ParagraphAlignment.CENTER);
+        NpoiHelper.content(document, v_mx_bsmmc_0 + "; 分析结果如下:", pos++, ParagraphAlignment.CENTER);
 
         List<Map<String, Object>> v_mx_data_0 = (List<Map<String, Object>>) sandiao.get("mx_data");
         List sanDiaoTitles = new ArrayList<NpoiHelper.TableTitle>();
@@ -272,7 +272,7 @@ public class GdbhReportServiceImpl implements GdbhReportService {
 
             String mx_bsmmc = (String) yz_data.get("mx_bsmmc");
             String mx_bsm = (String) yz_data.get("mx_bsm");
-            NpoiHelper.content(document, mx_bsmmc + "; 分析结果如下:", pos++,  ParagraphAlignment.CENTER);
+            NpoiHelper.content(document, mx_bsmmc + "; 分析结果如下:", pos++, ParagraphAlignment.CENTER);
             List<Map> mx_data_list = (List<Map>) yz_data.get("mx_data");
             for (Map d0_yz_data : mx_data_list) {
                 Integer d0_sumcount = (Integer) d0_yz_data.get("sumcount");
@@ -302,7 +302,8 @@ public class GdbhReportServiceImpl implements GdbhReportService {
                 }
 
                 //TODO 先测试
-                List<Map> res_1 = (List<Map>) res_0.get(RequestResult.DATA_TAG);
+                Map<String, Object> res_11 = (Map) res_0.get(RequestResult.DATA_TAG);
+                List<Map> res_1 = (List<Map>) res_11.get("datalist");
 
                 WktsVo wktsVo = new WktsVo();
                 List<WktsVo.WktInfo> wktInfos = new ArrayList<>();

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

@@ -127,15 +127,20 @@ public class DimEntityServiceImpl implements DimEntityService {
         //获取所有的实体关系表
         List<String> tablesList = dimEntityMapper.querySchemaTableByName("vector", "实体图元关联表");
 
+
         //通过实体关系表，获取实体关系表中，所有映射的实体代理点。此处创建视图，视图将一个小时后删除
         StringBuilder viewSql = new StringBuilder();
-        for (int i = 0; i < tablesList.size(); i++) {
-            if (i > 0) {
-                viewSql.append(" union all ");
+        if (tablesList == null || tablesList.isEmpty()) {
+            viewSql.append("SELECT  null entilayer");
+        } else {
+            for (int i = 0; i < tablesList.size(); i++) {
+                if (i > 0) {
+                    viewSql.append(" union all ");
+                }
+                String tableName = tablesList.get(i).trim();
+                String sql = "SELECT  entilayer  FROM vector.\"" + tableName + "\" x group by entilayer";
+                viewSql.append(sql);
             }
-            String tableName = tablesList.get(i).trim();
-            String sql = "SELECT  entilayer  FROM vector.\"" + tableName + "\" x group by entilayer";
-            viewSql.append(sql);
         }
         dimEntityMapper.createEntityCodeTableDataViewByTableSql(viewSql.toString(), viewTableName);
     }