From 673fe65a0ff070c7f22bd86830084a9643f60202 Mon Sep 17 00:00:00 2001
From: niujiyi <18272501226@163.com>
Date: Tue, 9 Jun 2026 17:31:54 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=91=E7=9D=A3=E7=AB=AF-=E5=85=AC=E5=91=8A?=
 =?UTF-8?q?=E4=B8=8A=E6=9E=B6=E4=B8=8B=E6=9E=B6=E6=95=B0=E6=8D=AE=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../EnforcementCarouselBannerServiceImpl.java | 23 +++++++++++--------
 .../impl/SysNoticeInfoServiceImpl.java        | 14 +++++++++--
 2 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnforcementCarouselBannerServiceImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnforcementCarouselBannerServiceImpl.java
index 6b1a552e..7988c5ee 100644
--- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnforcementCarouselBannerServiceImpl.java
+++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnforcementCarouselBannerServiceImpl.java
@@ -246,18 +246,21 @@ public class EnforcementCarouselBannerServiceImpl implements IEnforcementCarouse
         }
         //判断状态为 3是表示已下架，企业端，执法端的轮播图片也需要下架删除
         Long status = bo.getStatus();
-        if (status != null && status == 3) {
-            ZdxtFileBo zdxtFileBo = new ZdxtFileBo();
-            zdxtFileBo.setBusinessId(bo.getId());
-            zdxtFileBo.setIsDelete2(1L);
-            zdxtFileService.updateByBo(zdxtFileBo);
-        } else if (status != null && status == 2){
-            ZdxtFileBo zdxtFileBo = new ZdxtFileBo();
-            zdxtFileBo.setBusinessId(bo.getId());
-            zdxtFileBo.setIsDelete2(0L);
-            zdxtFileService.updateByBo(zdxtFileBo);
+        if(status !=null){
+            if (status == 3) {
+                ZdxtFileBo zdxtFileBo = new ZdxtFileBo();
+                zdxtFileBo.setBusinessId(bo.getId());
+                zdxtFileBo.setIsDelete2(1L);
+                zdxtFileService.updateByBo(zdxtFileBo);
+            } else if (status == 2){
+                ZdxtFileBo zdxtFileBo = new ZdxtFileBo();
+                zdxtFileBo.setBusinessId(bo.getId());
+                zdxtFileBo.setIsDelete2(0L);
+                zdxtFileService.updateByBo(zdxtFileBo);
+            }
         }
 
+
         return flag;
     }
 
diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/SysNoticeInfoServiceImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/SysNoticeInfoServiceImpl.java
index 96a03407..d8eaad73 100644
--- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/SysNoticeInfoServiceImpl.java
+++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/SysNoticeInfoServiceImpl.java
@@ -156,7 +156,7 @@ public class SysNoticeInfoServiceImpl implements ISysNoticeInfoService {
         lqw.eq(StringUtils.isNotBlank(bo.getOrganId()), SysNoticeInfo::getOrganId, bo.getOrganId());
         lqw.like(StringUtils.isNotBlank(bo.getCreateByName()), SysNoticeInfo::getCreateByName, bo.getCreateByName());
         lqw.like(StringUtils.isNotBlank(bo.getUpdateByName()), SysNoticeInfo::getUpdateByName, bo.getUpdateByName());
-        lqw.eq(bo.getIsDelete() != null, SysNoticeInfo::getIsDelete, bo.getIsDelete());
+        lqw.eq( SysNoticeInfo::getIsDelete, 0L);
         return lqw;
     }
 
@@ -210,7 +210,17 @@ public class SysNoticeInfoServiceImpl implements ISysNoticeInfoService {
         update.setUpdateTime(new Date(System.currentTimeMillis()));
         update.setUpdateBy(LoginHelper.getUserId()!= null ? LoginHelper.getUserId() : null);
         update.setUpdateByName(LoginHelper.getUsername()!= null ? LoginHelper.getUsername() : null);
-        return baseMapper.updateById(update) > 0;
+        // 状态为null 表示编辑直接修改
+        Long status = update.getStatus();
+        if (status !=null){
+            if (status==2){
+                update.setIsDelete(0L);
+            } else if (status==3){
+                update.setIsDelete(1L);
+            }
+        }
+
+        return baseMapper.updateById(update)> 0;
     }
 
     /**