Merge remote-tracking branch 'origin/master'

src/main/java/ieven/server/webapp/api/AlipayController.java

@@ -174,13 +174,13 @@ public class AlipayController {
             String clickHeader = input.getClickHeader();
             String lineId = input.getLineId();
             Criteria criteria = this.resolveDetailQuery(filename, fileId, lineId, clickHeader);
+            if(input.getDeleteName()==2){
+                criteria.andOperator(PublicStatic.getQuery());
+            }
             if (criteria == null) {
                 return Mapped.ERROR("未查询到明细");
             } else {
                 Query query = new Query(criteria);
-                if(input.getDeleteName()==2){
-                    query.addCriteria(new Criteria().andOperator(PublicStatic.getQuery()));
-                }
                 MongoCursor<Document> cursor =
                         this.mongoTemplate
                                 .getCollection("data")
@@ -190,7 +190,7 @@ public class AlipayController {
                                 .cursor();
                 Exporter exporter = new Exporter();
                 List<String> fileIds = this.destFileId(fileId);
-                String exportFileId = exporter.export(cursor, fileIds.get(0), null);
+                String exportFileId = exporter.export(cursor, fileIds.get(0), filename);
                 Mapped mapped = Mapped.OK();
                 mapped.put("result", exportFileId);
                 return mapped;