材料缴交提交后重复问题

src/main/java/com/xjrsoft/module/material/dto/MaterialTaskAssignListDto.java

@@ -15,8 +15,9 @@ public class MaterialTaskAssignListDto {
      */
     private Integer state;
 
-    /**
-     * 姓名
-     */
+    @ApiModelProperty("姓名")
     private String name;
+
+    @ApiModelProperty("部门id")
+    private Long deptId;
 }

src/main/java/com/xjrsoft/module/material/service/impl/MaterialTaskServiceImpl.java

@@ -2,6 +2,7 @@ package com.xjrsoft.module.material.service.impl;
 
 import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.extra.spring.SpringUtil;
 import cn.hutool.json.JSONUtil;
@@ -491,6 +492,7 @@ public class MaterialTaskServiceImpl extends MPJBaseServiceImpl<MaterialTaskMapp
                 .eq(MaterialTaskAssign::getMaterialTaskId, dto.getMaterialTaskId())
                 .eq(MaterialTaskAssign::getStatus, dto.getState())
                 .like(StrUtil.isNotEmpty(dto.getName()), XjrUser::getName, dto.getName())
+                .like(ObjectUtil.isNotEmpty(dto.getDeptId()), Department::getId, dto.getDeptId())
         ;
 
         List<MaterialTaskAssignListVo> pageOutput = materialTaskMaterialTaskAssignMapper.selectJoinList(MaterialTaskAssignListVo.class, queryWrapper);
@@ -512,6 +514,9 @@ public class MaterialTaskServiceImpl extends MPJBaseServiceImpl<MaterialTaskMapp
             List<Long> fileIds = appendixFileMap.get(el.getId()).stream().map(MaterialTaskAppendix::getFileId).collect(Collectors.toList());
             List<File> fileList = fileService.list(Wrappers.<File>query().lambda().in(File::getId, fileIds));
             el.setFiles(fileList);
+            if(!fileList.isEmpty()){
+                el.setFolderId(fileList.get(0).getFolderId());
+            }
         }
 
         return pageOutput;