From 41605e66e587f4be166223e0ebbcb29a1f1fd135 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Thu, 1 Feb 2024 14:43:53 +0800
Subject: [PATCH] =?UTF-8?q?fix:=2081610=20=E9=97=AE=E7=AD=94=E5=BA=93--?=
 =?UTF-8?q?=E5=9B=9E=E7=AD=94=E8=BE=93=E5=85=A5=E4=BB=A3=E7=A0=81=EF=BC=8C?=
 =?UTF-8?q?=E8=BF=99=E6=98=AF=E6=95=B0=E6=8D=AE=E5=86=8D=E8=BF=9B=E5=8E=BB?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=98=BE=E7=A4=BA=E4=B8=8D=E6=AD=A3=E7=A1=AE?=
 =?UTF-8?q?=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/LawsProblemLibraryServiceImpl.java    | 10 ++++++----
 .../modules/sys/controller/LawsGradeController.java    |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

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<LawsProblemLibrar
             answerList.forEach(answer -> {
                 SysUser sysUser = userList.stream().filter(user -> answer.getUserId()
                         .equals(user.getId())).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());
+                if (StrUtil.isNotBlank(answer.getOrgCode())) {
+                    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.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<LawsGrade, ILawsGradeSer
      * 查询（没有按钮权限）
      */
     @AutoLog(value = "级别-列表查询(没有按钮权限)")
-    @ApiOperation(value="级别-列表查询", notes="级别-列表查询(没有按钮权限)")
+    @ApiOperation(value="级别-列表查询(没有按钮权限)", notes="级别-列表查询(没有按钮权限)")
     @GetMapping(value = "/listWithoutPermission")
     public Result<List<LawsGrade>> queryListWithoutPermission() {
         List<LawsGrade> grades = lawsGradeService.queryList();