From 84ed045a8b0353ef72c2c45b2411a059feb84e82 Mon Sep 17 00:00:00 2001
From: fengshuonan <sn93@qq.com>
Date: Fri, 12 Jan 2024 17:04:07 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=908.0.5=E3=80=91=E3=80=90notice=E3=80=91?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=BC=96=E8=BE=91=E9=80=9A=E7=9F=A5=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../notice/enums/SysNoticeExceptionEnum.java  |  9 +++-
 .../service/impl/SysNoticeServiceImpl.java    | 46 ++++++++++++++-----
 2 files changed, 42 insertions(+), 13 deletions(-)

diff --git a/kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/sys/modular/notice/enums/SysNoticeExceptionEnum.java b/kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/sys/modular/notice/enums/SysNoticeExceptionEnum.java
index c38fe0d1a..7cb9a271a 100644
--- a/kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/sys/modular/notice/enums/SysNoticeExceptionEnum.java
+++ b/kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/sys/modular/notice/enums/SysNoticeExceptionEnum.java
@@ -16,12 +16,17 @@ public enum SysNoticeExceptionEnum implements AbstractExceptionEnum {
     /**
      * 查询结果不存在
      */
-    SYS_NOTICE_NOT_EXISTED(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + "10001", "查询结果不存在"),
+    SYS_NOTICE_NOT_EXISTED(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + "10001", "通知不存在"),
 
     /**
      * 通知范围不能为空
      */
-    SYS_NOTICE_SCOPE_EMPTY(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + "10002", "通知范围不能为空");
+    SYS_NOTICE_SCOPE_EMPTY(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + "10002", "通知范围不能为空"),
+
+    /**
+     * 通知已经发布，无法修改
+     */
+    SYS_NOTICE_CANT_EDIT(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + "10003", "通知已经发布，无法修改");
 
     /**
      * 错误编码
diff --git a/kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/sys/modular/notice/service/impl/SysNoticeServiceImpl.java b/kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/sys/modular/notice/service/impl/SysNoticeServiceImpl.java
index f5e858ecd..5e5e63f90 100644
--- a/kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/sys/modular/notice/service/impl/SysNoticeServiceImpl.java
+++ b/kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/sys/modular/notice/service/impl/SysNoticeServiceImpl.java
@@ -35,18 +35,10 @@ public class SysNoticeServiceImpl extends ServiceImpl<SysNoticeMapper, SysNotice
     @Transactional(rollbackFor = Exception.class)
     public void add(SysNoticeRequest sysNoticeRequest) {
 
-        // 1. 判断通知人员范围不能为空
-        NoticeUserScope noticeUserScope = sysNoticeRequest.getNoticeUserScope();
-        if (noticeUserScope == null) {
-            throw new ServiceException(SysNoticeExceptionEnum.SYS_NOTICE_SCOPE_EMPTY);
-        }
+        // 1. 校验通知的人员范围是否为空
+        this.validateUserScope(sysNoticeRequest);
 
-        // 2. 通知的人员和部门不能同时为空
-        if (ObjectUtil.isEmpty(noticeUserScope.getPointOrgList()) && ObjectUtil.isEmpty(noticeUserScope.getPointUserList())) {
-            throw new ServiceException(SysNoticeExceptionEnum.SYS_NOTICE_SCOPE_EMPTY);
-        }
-
-        // 3. 存储基础信息
+        // 2. 存储基础信息
         SysNotice sysNotice = new SysNotice();
         BeanUtil.copyProperties(sysNoticeRequest, sysNotice);
 
@@ -70,7 +62,20 @@ public class SysNoticeServiceImpl extends ServiceImpl<SysNoticeMapper, SysNotice
 
     @Override
     public void edit(SysNoticeRequest sysNoticeRequest) {
+
+        // 1. 校验通知的人员范围是否为空
+        this.validateUserScope(sysNoticeRequest);
+
+        // 2. 如果当前的通知是已经发布了，则不允许修改
         SysNotice sysNotice = this.querySysNotice(sysNoticeRequest);
+        if (sysNotice == null) {
+            throw new ServiceException(SysNoticeExceptionEnum.SYS_NOTICE_NOT_EXISTED);
+        }
+        if (NoticePublishStatusEnum.ALREADY.getCode().equals(sysNotice.getPublishStatus())) {
+            throw new ServiceException(SysNoticeExceptionEnum.SYS_NOTICE_CANT_EDIT);
+        }
+
+        // 3. 修改通知信息
         BeanUtil.copyProperties(sysNoticeRequest, sysNotice);
         this.updateById(sysNotice);
     }
@@ -142,4 +147,23 @@ public class SysNoticeServiceImpl extends ServiceImpl<SysNoticeMapper, SysNotice
         return queryWrapper;
     }
 
+    /**
+     * 校验通知的人员范围是否为空
+     *
+     * @author fengshuonan
+     * @since 2024-01-12 17:03
+     */
+    private void validateUserScope(SysNoticeRequest sysNoticeRequest) {
+        // 1. 判断通知人员范围不能为空
+        NoticeUserScope noticeUserScope = sysNoticeRequest.getNoticeUserScope();
+        if (noticeUserScope == null) {
+            throw new ServiceException(SysNoticeExceptionEnum.SYS_NOTICE_SCOPE_EMPTY);
+        }
+
+        // 2. 通知的人员和部门不能同时为空
+        if (ObjectUtil.isEmpty(noticeUserScope.getPointOrgList()) && ObjectUtil.isEmpty(noticeUserScope.getPointUserList())) {
+            throw new ServiceException(SysNoticeExceptionEnum.SYS_NOTICE_SCOPE_EMPTY);
+        }
+    }
+
 }