材料缴交提交后重复问题

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

@@ -479,7 +479,7 @@ public class MaterialTaskServiceImpl extends MPJBaseServiceImpl<MaterialTaskMapp
 
         MPJLambdaWrapper<MaterialTaskAssign> queryWrapper = new MPJLambdaWrapper<>();
         queryWrapper
-                .select(MaterialTaskAssign::getMaterialTaskId)
+                .select(MaterialTaskAssign::getId)
                 .select(MaterialTaskAssign.class, x -> VoToColumnUtil.fieldsToColumns(MaterialTaskAssign.class).contains(x.getProperty()))
                 .selectAs(XjrUser::getName, MaterialTaskAssignListVo::getName)
                 .selectAs(XjrUser::getUserName, MaterialTaskAssignListVo::getUserName)
@@ -489,6 +489,8 @@ public class MaterialTaskServiceImpl extends MPJBaseServiceImpl<MaterialTaskMapp
                 .leftJoin(UserDeptRelation.class, UserDeptRelation::getUserId, MaterialTaskAssign::getUserId)
                 .leftJoin(Department.class, Department::getId, UserDeptRelation::getDeptId)
                 .eq(MaterialTaskAssign::getMaterialTaskId, dto.getMaterialTaskId())
+                .eq(MaterialTaskAssign::getStatus, dto.getState())
+                .like(StrUtil.isNotEmpty(dto.getName()), XjrUser::getName, dto.getName())
         ;
 
         List<MaterialTaskAssignListVo> pageOutput = materialTaskMaterialTaskAssignMapper.selectJoinList(MaterialTaskAssignListVo.class, queryWrapper);
@@ -504,8 +506,11 @@ public class MaterialTaskServiceImpl extends MPJBaseServiceImpl<MaterialTaskMapp
 
         for (MaterialTaskAssignListVo el : pageOutput){
             materialTypeService.handleFileAndTemplate(el, el.getMaterialCategory());
+            if(appendixFileMap.get(el.getId())  == null){
+                continue;
+            }
             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::getFolderId, fileIds));
+            List<File> fileList = fileService.list(Wrappers.<File>query().lambda().in(File::getId, fileIds));
             el.setFiles(fileList);
         }