diff --git a/laws-modules/src/main/java/com/jero/modules/laws/library/service/impl/LawsProblemLibraryServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/library/service/impl/LawsProblemLibraryServiceImpl.java
index 259a1758..332aa649 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/library/service/impl/LawsProblemLibraryServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/library/service/impl/LawsProblemLibraryServiceImpl.java
@@ -154,11 +154,13 @@ public class LawsProblemLibraryServiceImpl extends ServiceImpl<LawsProblemLibrar
             answerList.forEach(answer -> {
                 SysUser sysUser = userList.stream().filter(user -> answer.getUserId()
                         .equals(user.getId())).collect(Collectors.toList()).get(0);
-                SysDepart sysDepart = departList.stream().filter(depart -> answer.getOrgCode()
-                        .equals(depart.getOrgCode())).collect(Collectors.toList()).get(0);
+                List<SysDepart> sysDepartList = departList.stream().filter(depart -> answer.getOrgCode()
+                        .equals(depart.getOrgCode())).collect(Collectors.toList());
+                if (CollectionUtils.isNotEmpty(sysDepartList)) {
+                    answer.setDepartName(sysDepartList.get(0).getDepartName());
+                }
                 answer.setAvatar(sysUser.getAvatar());
                 answer.setName(sysUser.getNameWorkNo());
-                answer.setDepartName(sysDepart.getDepartName());
             });
         }