From 54437c59db17bd365519c0367e2197249ddd83fd Mon Sep 17 00:00:00 2001
From: caozhen <18736171426@139.com>
Date: Thu, 7 Sep 2023 12:02:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A4=E6=96=AD=E7=BA=A7=E5=88=AB-=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E6=97=B6=E9=80=89=E6=8B=A9id,=E7=BA=A7=E5=88=AB?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=9B=9E=E6=98=BE=E9=83=A8=E9=97=A8id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jero/modules/sys/controller/LawsGradeController.java  | 4 ++++
 .../jero/modules/sys/service/impl/LawsGradeServiceImpl.java   | 2 ++
 2 files changed, 6 insertions(+)

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 19da4c65..b524c4de 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
@@ -8,6 +8,7 @@ import com.jero.modules.sys.service.ILawsGradeService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
@@ -49,6 +50,9 @@ public class LawsGradeController extends JeroController<LawsGrade, ILawsGradeSer
     @ApiOperation(value="级别-编辑", notes="级别-编辑")
     @PostMapping(value = "/edit")
     public Result<T> edit(@Validated @RequestBody LawsGrade lawsGrade) {
+        if (StringUtils.isBlank(lawsGrade.getId())){
+            return Result.error("请选择数据!");
+        }
         lawsGradeService.edit(lawsGrade);
         return Result.OK("操作成功!");
     }
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 fd310738..08765d09 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
@@ -49,7 +49,9 @@ public class LawsGradeServiceImpl extends ServiceImpl<LawsGradeMapper, LawsGrade
                 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(","));
+                String departIds = sysDepartList.stream().map(SysDepart::getId).collect(Collectors.joining(","));
                 grade.setDeptNames(departNames);
+                grade.setDeptIds(departIds);
             }
         }
         return grades;