Merge branch 'dev-excel0521' of http://114.244.114.158:8802/gushoubang/one-code-manage into dev-excel0521

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/controller/cadastre/CadastreManageController.java

@@ -328,7 +328,6 @@ public class CadastreManageController extends BaseController {
                 }
             }
 
-
             if (StringUtils.isNotBlank(cxfw)) {
                 if (!cxfw.contains("SRID=")) {
                     cxfw = "SRID=" + "4326" + ";" + cxfw;
@@ -339,7 +338,9 @@ public class CadastreManageController extends BaseController {
 
             if(StringUtils.isNotBlank(qlr)){
                 String qlrWhere = cadastreManageService.getQlrList(qlr);
-                ywh +=  " AND "+qlrWhere;
+                if(StringUtils.isNotBlank(qlrWhere)){
+                    ywh +=  " AND "+qlrWhere;
+                }
             }
             List<Map<String, Object>> res = cadastreManageService.selectTableRow(tableName, geomFlag, bsm, ywh);
             return R.ok(res);

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/domain/vo/CadastreFileFilterVo.java

@@ -28,10 +28,15 @@ public class CadastreFileFilterVo {
     private String storageEndTime;
 
 
-
     /**
      * 状态
      */
+    private String status;
+
+
+    /**
+     * 更新情况
+     */
     private String readStatus;
 
     // 分页参数

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

@@ -240,6 +240,10 @@
             <if test="readStatus != null and readStatus != ''">
                 AND read_status = #{readStatus}
             </if>
+            <if test="status != null and status != ''">
+                AND status = #{status}
+            </if>
+
         </where>
         ORDER BY upload_time DESC
         LIMIT #{pageSize} OFFSET #{offset}
@@ -267,6 +271,9 @@
             <if test="readStatus != null and readStatus != ''">
                 AND read_status = #{readStatus}
             </if>
+            <if test="status != null and status != ''">
+                AND status = #{status}
+            </if>
         </where>
     </select>