diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayDataDirectoryController.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayDataDirectoryController.java
index 2350c115..32d146e9 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayDataDirectoryController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayDataDirectoryController.java
@@ -43,12 +43,11 @@ import io.swagger.annotations.ApiOperation;
 public class PayDataDirectoryController extends JeroController<PayDataDirectory, IPayDataDirectoryService> {
 	 @Autowired
 	 private IPayDataDirectoryService payDataDirectoryService;
-//	 @Resource
-//	 private PayDataDirectoryMapper payDataDirectoryMapper;
+	 @Resource
+	 private PayDataDirectoryMapper payDataDirectoryMapper;
 
 	 ArrayList<String> list = new ArrayList<>();
 	 ArrayList<PayDataDirectory> list2 = new ArrayList<>();
-	 LoginUser sysUser = null;//(LoginUser) SecurityUtils.getSubject().getPrincipal();
 
 	 /**
 	  * 资料目录树
@@ -59,6 +58,7 @@ public class PayDataDirectoryController extends JeroController<PayDataDirectory,
 	 @ApiOperation(value = "资料目录管理-树", notes = "资料目录管理-树")
 	 @GetMapping(value = "/tree")
 	 public Result<?> tree() {
+		 LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal();
 		 QueryWrapper<PayDataDirectory> queryWrapper = new QueryWrapper();
 		 queryWrapper.eq("type",1);
 		 queryWrapper.eq("create_by",sysUser.getUsername());
@@ -104,11 +104,12 @@ public class PayDataDirectoryController extends JeroController<PayDataDirectory,
 	 @ApiOperation(value = "资料目录管理-新增", notes = "资料目录管理-新增")
 	 @PostMapping(value = "/add")
 	 public Result<?> add(@Valid @RequestBody PayDataDirectoryDTO payDataDirectoryDTO) {
-		 LambdaQueryWrapper<PayDataDirectory> lambdaQueryWrapper = new LambdaQueryWrapper();
+		 LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal();
+		 LambdaQueryWrapper<PayDataDirectory> lambdaQueryWrapper = new LambdaQueryWrapper<>();
 		 lambdaQueryWrapper.eq(PayDataDirectory::getParentId, payDataDirectoryDTO.getParentId());
 		 lambdaQueryWrapper.eq(PayDataDirectory::getType, 1);
 		 lambdaQueryWrapper.eq(PayDataDirectory::getCreateBy, sysUser.getUsername());
-		 List<PayDataDirectory> payDataDirectories = null;//payDataDirectoryMapper.selectList(lambdaQueryWrapper);
+		 List<PayDataDirectory> payDataDirectories = payDataDirectoryService.list(lambdaQueryWrapper);
 		 for(PayDataDirectory PayDataDirectory :payDataDirectories){
 			if(PayDataDirectory.getName().equals(payDataDirectoryDTO.getName())){
 				return Result.error("同级文件名重复，请重新输入。");
@@ -154,20 +155,21 @@ public class PayDataDirectoryController extends JeroController<PayDataDirectory,
 	 @ApiOperation(value = "资料目录管理-查询所有", notes = "资料目录管理-查询所有")
 	 @GetMapping(value = "/findall")
 	 public Result<?> findall() {
-		 LambdaQueryWrapper<PayDataDirectory> lambdaQueryWrapper = new LambdaQueryWrapper();
+		 LambdaQueryWrapper<PayDataDirectory> lambdaQueryWrapper = new LambdaQueryWrapper<>();
 		 lambdaQueryWrapper.eq(PayDataDirectory::getType, 1);
-		 List<PayDataDirectory> payDataDirectories = null;//payDataDirectoryMapper.selectList(lambdaQueryWrapper);
+		 List<PayDataDirectory> payDataDirectories =payDataDirectoryService.list(lambdaQueryWrapper);
 		 return Result.OK(payDataDirectories);
 	 }
 
 
 	 //递归查询子文件夹
 	 private void getPayDataDirectories(String id) {
-		 LambdaQueryWrapper<PayDataDirectory> lambdaQueryWrapper = new LambdaQueryWrapper();
+		 LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal();
+		 LambdaQueryWrapper<PayDataDirectory> lambdaQueryWrapper = new LambdaQueryWrapper<>();
 		 lambdaQueryWrapper.eq(PayDataDirectory::getParentId, id);
 		 lambdaQueryWrapper.eq(PayDataDirectory::getType, 1);
 		 lambdaQueryWrapper.eq(PayDataDirectory::getCreateBy, sysUser.getUsername());
-		 List<PayDataDirectory> payDataDirectories = null;//payDataDirectoryMapper.selectList(lambdaQueryWrapper);
+		 List<PayDataDirectory> payDataDirectories = payDataDirectoryService.list(lambdaQueryWrapper);
 		 //判断有无子文件夹
 		 if(payDataDirectories.size()>0){
 		 for (PayDataDirectory payDataDirector : payDataDirectories) {
@@ -186,11 +188,12 @@ public class PayDataDirectoryController extends JeroController<PayDataDirectory,
 	@ApiOperation(value="资料目录管理-通过name查询", notes="资料目录管理-通过name查询")
 	@GetMapping(value = "/queryByName")
 	public Result<?> queryByName(@RequestParam(name="name",required=false) String name) {
-		QueryWrapper queryWrapper = new QueryWrapper();
+		LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal();
+		QueryWrapper<PayDataDirectory> queryWrapper = new QueryWrapper<>();
 		queryWrapper.like(StringUtils.isNotBlank(name), "name", name);
 		queryWrapper.eq("type",1);
 		queryWrapper.eq("create_by",sysUser.getUsername());
-		List<PayDataDirectory> byName = null;//payDataDirectoryMapper.selectList(queryWrapper);
+		List<PayDataDirectory> byName = payDataDirectoryService.list(queryWrapper);
 		for(PayDataDirectory payDataDirectory:byName) {
 			list2.add(payDataDirectory);
 			findToTree(payDataDirectory);
@@ -207,7 +210,8 @@ public class PayDataDirectoryController extends JeroController<PayDataDirectory,
 	  * @param payDataDirectory
 	  */
 	 private void findToTree(PayDataDirectory payDataDirectory) {
-		 LambdaQueryWrapper<PayDataDirectory> lambdaQueryWrapper = new LambdaQueryWrapper();
+		 LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal();
+		 LambdaQueryWrapper<PayDataDirectory> lambdaQueryWrapper = new LambdaQueryWrapper<>();
 		 lambdaQueryWrapper.eq(PayDataDirectory::getId, payDataDirectory.getParentId());
 		 lambdaQueryWrapper.eq(PayDataDirectory::getType, 1);
 		 lambdaQueryWrapper.eq(PayDataDirectory::getCreateBy, sysUser.getUsername());