Merge branch 'dev-excel0521' into dev-to-user

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);