材料缴交

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

@@ -120,7 +120,7 @@ public class MaterialTaskServiceImpl extends MPJBaseServiceImpl<MaterialTaskMapp
                     }});
                 }
             }else if(materialAssignUserDto.getUserType() == 3){
-                MaterialTaskAssignUserVo materialTaskAssignUserVo = xjrUserService.selectJoinOne(MaterialTaskAssignUserVo.class,
+                List<MaterialTaskAssignUserVo> materialTaskAssignUserVoList = xjrUserService.selectJoinList(MaterialTaskAssignUserVo.class,
                         new MPJLambdaWrapper<XjrUser>()
                                 .select(XjrUser::getId)
                                 .selectAs(XjrUser::getUserName, MaterialTaskAssignUserVo::getUserName)
@@ -129,7 +129,8 @@ public class MaterialTaskServiceImpl extends MPJBaseServiceImpl<MaterialTaskMapp
                                 .eq(XjrUser::getId, materialAssignUserDto.getUserId())
                                 .eq(XjrUser::getDeleteMark, DeleteMark.NODELETE.getCode())
                 );
-                if(materialTaskAssignUserVo != null){
+                if(materialTaskAssignUserVoList != null && !materialTaskAssignUserVoList.isEmpty()){
+                    MaterialTaskAssignUserVo materialTaskAssignUserVo = materialTaskAssignUserVoList.get(0);
                     materialTaskAssignMap.put(materialTaskAssignUserVo.getId(), new MaterialTaskAssign(){{
                         setUserId(materialAssignUserDto.getUserId());
                         setUserType(materialTaskAssignUserVo.getRoleId() == 3 ? 2 : 1);