1
0
chenendian 3 недель назад
Родитель
Сommit
e40902a853

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

@@ -340,6 +340,8 @@ public class CadastreManageController extends BaseController {
                 String qlrWhere = cadastreManageService.getQlrList(qlr);
                 String qlrWhere = cadastreManageService.getQlrList(qlr);
                 if(StringUtils.isNotBlank(qlrWhere)){
                 if(StringUtils.isNotBlank(qlrWhere)){
                     ywh +=  " AND "+qlrWhere;
                     ywh +=  " AND "+qlrWhere;
+                }else{
+                    ywh +=  " AND 1=2 ";
                 }
                 }
             }
             }
             List<Map<String, Object>> res = cadastreManageService.selectTableRow(tableName, geomFlag, bsm, ywh);
             List<Map<String, Object>> res = cadastreManageService.selectTableRow(tableName, geomFlag, bsm, ywh);

+ 3 - 0
siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/zrzysite/impl/ZrzysiteCommonServiceImpl.java

@@ -402,6 +402,9 @@ public class ZrzysiteCommonServiceImpl implements IZrzysiteCommonService {
 
 
                 for (ZrzysiteAttachment attachment : zrzysiteAttachmentList) {
                 for (ZrzysiteAttachment attachment : zrzysiteAttachmentList) {
                     String url = attachment.getAttachment();
                     String url = attachment.getAttachment();
+                    if(StringUtils.isBlank(url)){ //这里避免空值造成数据无法传输
+                        continue;
+                    }
                     String directoryName = attachment.getClmc();
                     String directoryName = attachment.getClmc();
                     String fileName = attachment.getFjmc();
                     String fileName = attachment.getFjmc();
 //                    //子目录存在先删除
 //                    //子目录存在先删除