diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeSubitemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeSubitemController.java
index c8563907..8ee2851e 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeSubitemController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeSubitemController.java
@@ -66,10 +66,12 @@ public class PayCaseCommitteeSubitemController extends JeroController<PayCaseCom
 								   ) {
 		QueryWrapper<PayCaseCommitteeSubitem> queryWrapper = Wrappers.query();
 		queryWrapper
+				.like(StringUtils.isNotBlank(name), "pt.name", name).or()
+				.like(StringUtils.isNotBlank(companyName), "pm.company_name", companyName)
 				.like(StringUtils.isNotBlank(fenBiaoWeiName), "pe.name", fenBiaoWeiName);
 		Page<PayCaseCommitteeSubitem> page = new Page<>(pageNo, pageSize);
 
-		IPage<FindByName> pageList = payCaseCommitteeSubitemService.list3(name,companyName,page, queryWrapper);
+		IPage<FindByName> pageList = payCaseCommitteeSubitemService.list3(page, queryWrapper);
 		List<FindByName> records = pageList.getRecords();
 		if (!CollectionUtils.isEmpty(records)) {
 			try {
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayDataFileController.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayDataFileController.java
index de1407df..4a314a1a 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayDataFileController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayDataFileController.java
@@ -2,10 +2,8 @@ package com.jero.data.controller;
 
 
 import java.io.*;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.UUID;
+import java.util.*;
+import java.util.stream.Collectors;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 import javax.annotation.Resource;
@@ -31,6 +29,7 @@ import com.jero.data.service.IPayFileDownloadRecordService;
 import com.jero.meeting.entity.PayMeetingSituation;
 import com.jero.meeting.service.IPayMeetingSituationService;
 import com.jero.modules.message.handle.impl.EmailSendMsgHandle;
+import com.jero.modules.oss.entity.OSSFile;
 import com.jero.modules.oss.service.IOSSFileService;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -115,7 +114,7 @@ public class PayDataFileController extends JeroController<PayDataFile, IPayDataF
 	@GetMapping(value = "/listMeeting")
 	@ApiImplicitParam(name = "id", value = "目录id，查询该目录下文件", dataType = "String", required = true)
 	public Result<?> queryPageListMeeting(
-											@RequestParam(name="id",required = true) String id,
+											@RequestParam(name="id") String id,
 											QueryFileListBySearch queryFileListBySearch,
 										    @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 										    @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
@@ -141,18 +140,28 @@ public class PayDataFileController extends JeroController<PayDataFile, IPayDataF
 		}
 		Page<PayDataFile> page = new Page<>(pageNo, pageSize);
 			queryWrapper.eq("pd.type",2);
+
 			queryWrapper.orderByDesc("pf.create_time");
 			queryWrapper.eq("pd.id",id);
-//		QueryWrapper<Object> queryWrapper = new QueryWrapper<>();
-//		queryWrapper.eq("pf.id",id);
-//		queryWrapper.like(StringUtils.isNotBlank(fileName),"of.fileName",fileName);
-//		queryWrapper.like(StringUtils.isNotBlank(meetingName),"of.fileName",meetingName);
-//		queryWrapper.orderByDesc("pf.create_time");
-//		queryWrapper.eq("pd.type",2);
-//		Page<PayDataFile> page = new Page<>(pageNo, pageSize);
 		IPage<QueryFileList> pageList = payDataFileService.pageDataMeeting(page,queryWrapper);
 		return Result.OK(pageList);
 	}
+//
+//public List<String> getAllChildrenId(String id){
+//	QueryWrapper<PayDataDirectory> queryWrapper = new QueryWrapper();
+//	List<PayDataDirectory> list = payDataDirectoryService.list(queryWrapper);
+//	List<DirectoryToTree> collect = list.stream()
+//			.filter(payDataDirectory -> "0".equals(payDataDirectory.getParentId()))
+//			.map(payDataDirectory -> {
+//				DirectoryToTree directoryToTree = transtoTree(id, list);
+//				return directoryToTree;
+//			}).sorted(Comparator.comparing(DirectoryToTree::getSort))
+//			.collect(Collectors.toList());
+//	return Result.OK(collect);
+//
+//
+//}
+
 
 	/**
 	 *   资料列表上传
@@ -224,6 +233,7 @@ public class PayDataFileController extends JeroController<PayDataFile, IPayDataF
 		iossFileService.removeById(oldFileId);
 		payDataFileService.removeById(keyId);
 		ArrayList<String> fileIdList = new ArrayList<>(Arrays.asList(fileIds.split(",")));
+		fileIdList.remove(oldFileId);
 		ArrayList<PayDataFile> list = new ArrayList<>();
 		stringBuffer = new StringBuffer();
 		findToTree(dataId, dataType);
@@ -439,11 +449,16 @@ public class PayDataFileController extends JeroController<PayDataFile, IPayDataF
 		 */
 		@AutoLog(value = "导出下载")
 		@ApiOperation(value="导出下载", notes="导出下载")
-		@ApiImplicitParam(name = "fileNames", value = "文件名称，多个以逗号隔开")
+		@ApiImplicitParam(name = "ids", value = "文件id，多个以逗号隔开")
 		@GetMapping(value = "/importFile")
-		public void importFile(@RequestParam(name="fileNames",required = true) String fileNames) {
-			ArrayList<String> fileIdList = new ArrayList<>(Arrays.asList(fileNames.split(",")));
-			zipFileDownload(fileIdList);
+		public void importFile(@RequestParam(name="ids",required = true) String ids) {
+			ArrayList<String> fileIdList = new ArrayList<>(Arrays.asList(ids.split(",")));
+			ArrayList<String> objects = new ArrayList<>();
+			for(String id :fileIdList){
+				OSSFile byId = iossFileService.getById(id);
+				objects.add(byId.getFileName());
+			}
+			zipFileDownload(objects);
 
 		}
 
@@ -481,10 +496,10 @@ public class PayDataFileController extends JeroController<PayDataFile, IPayDataF
 			zipos = new ZipOutputStream(new BufferedOutputStream(response.getOutputStream()));
 			zipos.setMethod(ZipOutputStream.DEFLATED); //设置压缩方法
 			for (String path : paths){
-				File file = new File(upLoadPath + "\\" + path + ".pdf");
+				File file = new File(upLoadPath + "\\" + path);
 				if(file.exists()){
 					try {
-						//添加ZipEntry，并ZipEntry中写入文件流
+						//添加ZipEntry，并ZipEntry中写入文件流w
 						//这里，防止要下载的文件有重名的导致下载失败
 						zipos.putNextEntry(new ZipEntry("folder/"+ file.getName()));
 						os = new DataOutputStream(zipos);
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayFileDownloadRecordController.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayFileDownloadRecordController.java
index cf723620..34e5e5a7 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayFileDownloadRecordController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayFileDownloadRecordController.java
@@ -99,7 +99,7 @@ public class PayFileDownloadRecordController extends JeroController<PayFileDownl
 		 byte[] buff = new byte[1024];
 		 BufferedInputStream bis = null;
 		 // 读取filename
-		 bis = new BufferedInputStream(new FileInputStream(new File(upLoadPath+"\\"+filename +".pdf")));
+		 bis = new BufferedInputStream(new FileInputStream(new File(upLoadPath+"\\"+filename)));
 		 int i = bis.read(buff);
 		 while (i != -1) {
 			 outputStream.write(buff, 0, buff.length);
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/DTO/PayDataDirectoryDTO.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/DTO/PayDataDirectoryDTO.java
index 87ff888a..365301d3 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/DTO/PayDataDirectoryDTO.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/DTO/PayDataDirectoryDTO.java
@@ -18,6 +18,7 @@ public class PayDataDirectoryDTO {
     @ApiModelProperty(value = "名称")
     private java.lang.String name;
 
+    @NotBlank(message = "排序号不能为空，不传可设置为0")
     @ApiModelProperty(value = "排序号")
     private java.lang.String sort;
 
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/QueryFileList.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/QueryFileList.java
index a864bd9c..2abc5cd4 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/QueryFileList.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/QueryFileList.java
@@ -9,7 +9,7 @@ import lombok.Data;
 public class QueryFileList {
 
     @ApiModelProperty(value = "主键id")
-    private java.lang.String keyid;
+    private java.lang.String keyId;
 
     @ApiModelProperty(value = "资料id")
     private java.lang.String dataId;
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/PayCaseCommitteeSubitemMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/PayCaseCommitteeSubitemMapper.java
index 3844b75c..afaaa538 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/PayCaseCommitteeSubitemMapper.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/PayCaseCommitteeSubitemMapper.java
@@ -24,7 +24,7 @@ import java.util.List;
  */
 public interface PayCaseCommitteeSubitemMapper extends BaseMapper<PayCaseCommitteeSubitem> {
 
-    Page<FindByName> list3 (String name,String companyName,IPage<PayCaseCommitteeSubitem> page, @Param(Constants.WRAPPER) Wrapper<PayCaseCommitteeSubitem> wrapper);
+    Page<FindByName> list3 (IPage<PayCaseCommitteeSubitem> page, @Param(Constants.WRAPPER) Wrapper<PayCaseCommitteeSubitem> wrapper);
 
     List<payCaseCommitteeSubitemVO> list2 (@Param(Constants.WRAPPER) Wrapper<PayCaseCommitteeSubitem> wrapper);
 
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeSubitemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeSubitemMapper.xml
index 72054e2f..e3af8555 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeSubitemMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeSubitemMapper.xml
@@ -4,33 +4,21 @@
     <resultMap id="people" type="com.jero.data.entity.FindByName">
         <id property="id" column="id"></id>
         <result property="name" column="name"></result>
-        <collection property="list" column="id" select="list4">
-
+        <collection property="list" ofType="com.jero.data.entity.ChildrenFindByName" javaType="java.util.List">
+            <id property="childrenId" column="childrenId"></id>
+            <result property="companyName" column="companyName"></result>
+            <result property="post" column="post"></result>
+            <result property="phone" column="phone"></result>
+            <result property="peopleName" column="peopleName"></result>
         </collection>
     </resultMap>
     <select id="list3"  resultMap="people">
-       SELECT pe.id as id,pe.name as name
+       SELECT pe.id as id,pt.name as peopleName,pm.company_name as companyName,pt.post as post,pt.phone as phone ,pe.name as name,pm.id as childrenId
        from
         pay_case_committee pe
-        ${ew.customSqlSegment}
-<!--         <if test="#{fenBiaoWeiName} != null  and #{fenBiaoWeiName} !=''">-->
-<!--             where pe.name=#{fenBiaoWeiName}-->
-<!--         </if>-->
-    </select>
-    <select id="list4"  resultType="com.jero.data.entity.ChildrenFindByName">
-      SELECT pt.name as peopleName,pm.company_name as companyName,pt.post as post,pt.phone as phone ,pm.id as childrenId
-       from
-         pay_case_committee_subitem pm
-        left JOIN pay_contacts_management pt on (pm.contacts_id = pt.id) where pm.committee_id = #{id}
-        ${wrapper2.customSqlSegment}
-        <where>
-        <if test="#{companyName} != null  and  #{companyName} !=''">
-            and pm.company_name=#{companyName}
-        </if>
-        <if test="#{name} != null  and  #{name} !=''">
-            and pt.name=#{name}
-        </if>
-        </where>
+        left JOIN pay_case_committee_subitem pm on (pe.id = pm.committee_id)
+        left JOIN pay_contacts_management pt on (pm.contacts_id = pt.id)
+         ${ew.customSqlSegment}
     </select>
 
 
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayDataFileMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayDataFileMapper.xml
index 876415b0..88d228ee 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayDataFileMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayDataFileMapper.xml
@@ -16,7 +16,7 @@
     </select>
 
     <select id="pageDataMeeting"  resultType="com.jero.data.entity.QueryFileList">
-        SELECT pf.id as keyid,
+        SELECT pf.id as keyId,
        pf.file_id as dataId,
        pf.data_id as fileId,
        pf.file_path as filePath,
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/service/IPayCaseCommitteeSubitemService.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/service/IPayCaseCommitteeSubitemService.java
index 03ad4508..56a8c777 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/data/service/IPayCaseCommitteeSubitemService.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/service/IPayCaseCommitteeSubitemService.java
@@ -28,5 +28,5 @@ public interface IPayCaseCommitteeSubitemService extends IService<PayCaseCommitt
 
     List<payCaseCommitteeSubitemVO> list2(QueryWrapper<PayCaseCommitteeSubitem> queryWrapper);
 
-    IPage<FindByName> list3(String name,String companyName,Page<PayCaseCommitteeSubitem> page, QueryWrapper<PayCaseCommitteeSubitem> queryWrapper);
+    IPage<FindByName> list3(Page<PayCaseCommitteeSubitem> page, QueryWrapper<PayCaseCommitteeSubitem> queryWrapper);
 }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayCaseCommitteeSubitemServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayCaseCommitteeSubitemServiceImpl.java
index accd0d4c..38b13ed2 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayCaseCommitteeSubitemServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayCaseCommitteeSubitemServiceImpl.java
@@ -46,7 +46,7 @@ public class PayCaseCommitteeSubitemServiceImpl extends ServiceImpl<PayCaseCommi
     }
 
     @Override
-    public IPage<FindByName> list3(String name,String companyName,Page<PayCaseCommitteeSubitem> page, QueryWrapper<PayCaseCommitteeSubitem> queryWrapper) {
-        return payCaseCommitteeSubitemMapper.list3(name,companyName,page, queryWrapper);
+    public IPage<FindByName> list3(Page<PayCaseCommitteeSubitem> page, QueryWrapper<PayCaseCommitteeSubitem> queryWrapper) {
+        return payCaseCommitteeSubitemMapper.list3(page, queryWrapper);
     }
 }