From 62673682f0b3a3aa83b474acd7e3fc4051550ef4 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Wed, 13 Dec 2023 10:57:12 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=81=E6=A0=87=E7=BA=A7=E5=88=AB?=
 =?UTF-8?q?=E6=98=A0=E5=B0=84=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3=E4=B8=89?=
 =?UTF-8?q?=E7=BA=A7=E9=83=A8=E9=97=A8Id=E7=BD=AE=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jero/modules/sys/service/impl/LawsGradeServiceImpl.java  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/sys/service/impl/LawsGradeServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/sys/service/impl/LawsGradeServiceImpl.java
index 1578cf59..1a87847f 100644
--- a/laws-modules/src/main/java/com/jero/modules/sys/service/impl/LawsGradeServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/sys/service/impl/LawsGradeServiceImpl.java
@@ -40,13 +40,13 @@ public class LawsGradeServiceImpl extends ServiceImpl<LawsGradeMapper, LawsGrade
     public List<LawsGrade> queryList() {
         List<LawsGrade> grades = lawsGradeService.list();
         List<LawsEnterpriseStandardLevel> standardLevels = lawsEnterpriseStandardLevelService.list();
-        if (standardLevels == null || standardLevels.size() == 0 || grades == null || grades.size() == 0){
+        if (standardLevels == null || standardLevels.isEmpty() || grades == null || grades.isEmpty()){
             return new ArrayList<>();
         }
         Map<String, List<LawsEnterpriseStandardLevel>> map = standardLevels.stream().collect(Collectors.groupingBy(LawsEnterpriseStandardLevel::getGradeId));
         for (LawsGrade grade : grades) {
             List<LawsEnterpriseStandardLevel> levels = map.get(grade.getId());
-            if (levels != null && levels.size() > 0){
+            if (levels != null && !levels.isEmpty()){
                 List<String> collect = levels.stream().map(LawsEnterpriseStandardLevel::getDeptId).distinct().collect(Collectors.toList());
                 List<SysDepart> sysDepartList = sysDepartService.listByIds(collect);
                 String departNames = sysDepartList.stream().map(SysDepart::getDepartName).collect(Collectors.joining(","));
@@ -57,6 +57,7 @@ public class LawsGradeServiceImpl extends ServiceImpl<LawsGradeMapper, LawsGrade
         }
         grades.get(0).setDeptNames("供应商");
         grades.get(3).setDeptNames("主起草部门");
+        grades.get(3).setDeptIds(null);
         return grades;
     }