1
0
chenendian 1 сар өмнө
parent
commit
0a5721c824

+ 4 - 1
siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/cadastre/impl/CadastreManageServiceImpl.java

@@ -1264,7 +1264,10 @@ public class CadastreManageServiceImpl implements CadastreManageService {
 
     @Override
     public List<Map<String,Object>> selectTableRow(String tableName,String geomFlag,String bsm,String ywh) {
-        String validFlag = "0";
+        String validFlag = "";
+        if(!Arrays.asList("tf_5000", "tf_1000", "tf_2000").contains("tableName")){
+            validFlag = "0";
+        }
         List<Map<String,Object>> res = cadastreFileMapper.selectTableDataByCondition(validFlag,tableName,bsm,ywh);
         if(CollectionUtils.isNotEmpty(res)){ //去掉geom字段和valid_flag字段
             //res.forEach(m -> m.keySet().removeIf(k -> "geom".equalsIgnoreCase(k)|| "valid_flag".equalsIgnoreCase(k)));

+ 5 - 1
siwei-modules/siwei-apply/src/main/resources/mapper/cadastre/CadastreFileMapper.xml

@@ -266,7 +266,11 @@
     <select id="selectTableDataByCondition"   resultType="Map">
         SELECT *
         FROM vector.${tableName}
-        WHERE valid_flag = ${validFlag}
+        WHERE 1=1
+        <if test="validFlag != null and validFlag != ''">
+            and valid_flag = ${validFlag}
+        </if>
+
         <if test="bsm != null and bsm != ''">
             and bsm= ${bsm}
         </if>