Merge remote-tracking branch 'origin/dev' into dev

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnforcementCarouselBannerServiceImpl.java

@@ -246,17 +246,20 @@ public class EnforcementCarouselBannerServiceImpl implements IEnforcementCarouse
         }
         //判断状态为 3是表示已下架，企业端，执法端的轮播图片也需要下架删除
         Long status = bo.getStatus();
-        if (status != null && status == 3) {
+        if(status !=null){
+            if (status == 3) {
                 ZdxtFileBo zdxtFileBo = new ZdxtFileBo();
                 zdxtFileBo.setBusinessId(bo.getId());
                 zdxtFileBo.setIsDelete2(1L);
                 zdxtFileService.updateByBo(zdxtFileBo);
-        } else if (status != null && status == 2){
+            } else if (status == 2){
                 ZdxtFileBo zdxtFileBo = new ZdxtFileBo();
                 zdxtFileBo.setBusinessId(bo.getId());
                 zdxtFileBo.setIsDelete2(0L);
                 zdxtFileService.updateByBo(zdxtFileBo);
             }
+        }
+
 
         return flag;
     }

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,6 +210,16 @@ 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);
+        // 状态为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;
     }