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 499bbfb2..119a940e 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 @@ -177,10 +177,12 @@ public class LawsProblemLibraryServiceImpl extends ServiceImpl { SysUser sysUser = userList.stream().filter(user -> answer.getUserId() .equals(user.getId())).collect(Collectors.toList()).get(0); - List sysDepartList = departList.stream().filter(depart -> answer.getOrgCode() - .equals(depart.getOrgCode())).collect(Collectors.toList()); - if (CollectionUtils.isNotEmpty(sysDepartList)) { - answer.setDepartName(sysDepartList.get(0).getDepartName()); + if (StrUtil.isNotBlank(answer.getOrgCode())) { + List 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.calcNameWorkNo()); diff --git a/laws-modules/src/main/java/com/jero/modules/sys/controller/LawsGradeController.java b/laws-modules/src/main/java/com/jero/modules/sys/controller/LawsGradeController.java index 75dc5e00..f838a4b9 100644 --- a/laws-modules/src/main/java/com/jero/modules/sys/controller/LawsGradeController.java +++ b/laws-modules/src/main/java/com/jero/modules/sys/controller/LawsGradeController.java @@ -52,7 +52,7 @@ public class LawsGradeController extends JeroController> queryListWithoutPermission() { List grades = lawsGradeService.queryList();