From 9686247e80d3600899e24866a89e5d6155f92f88 Mon Sep 17 00:00:00 2001
From: SjS <email@example.com>
Date: Sat, 26 Apr 2025 16:08:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=8F=E8=AE=AE=E6=96=B0=E5=A2=9E=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/ruoyi/bst/ad/domain/Ad.java     |  2 --
 .../ruoyi/bst/ad/service/impl/AdConverterImpl.java    | 11 +++++++++--
 .../src/main/java/com/ruoyi/web/bst/AdController.java |  1 +
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/ad/domain/Ad.java b/ruoyi-service/src/main/java/com/ruoyi/bst/ad/domain/Ad.java
index 75a38d5..371ddb3 100644
--- a/ruoyi-service/src/main/java/com/ruoyi/bst/ad/domain/Ad.java
+++ b/ruoyi-service/src/main/java/com/ruoyi/bst/ad/domain/Ad.java
@@ -46,8 +46,6 @@ public class Ad extends BaseEntity implements LogBizParam
 
     @Excel(name = "运营区id")
     @ApiModelProperty("运营区id")
-    @NotNull(message = "运营区ID不能为空", groups = {ValidGroup.Create.class})
-    @Min(value = 1, message = "运营区ID需大于0")
     private Long areaId;
 
     @Excel(name = "跳转链接")
diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/ad/service/impl/AdConverterImpl.java b/ruoyi-service/src/main/java/com/ruoyi/bst/ad/service/impl/AdConverterImpl.java
index 96d71c9..faa8a47 100644
--- a/ruoyi-service/src/main/java/com/ruoyi/bst/ad/service/impl/AdConverterImpl.java
+++ b/ruoyi-service/src/main/java/com/ruoyi/bst/ad/service/impl/AdConverterImpl.java
@@ -1,6 +1,7 @@
 package com.ruoyi.bst.ad.service.impl;
 
 import com.ruoyi.bst.ad.domain.Ad;
+import com.ruoyi.bst.ad.domain.enums.AdBlong;
 import com.ruoyi.bst.ad.service.AdConverter;
 import org.springframework.stereotype.Service;
 
@@ -15,8 +16,11 @@ public class AdConverterImpl implements AdConverter {
             return null;
         }
         Ad po = new Ad();
+        po.setAreaId(null);
         // 基础信息
-        po.setAreaId(data.getAreaId());
+        if (po.getBelong().equals(AdBlong.STORE.getCode())) {
+            po.setAreaId(data.getAreaId());
+        }
         po.setType(data.getType());
         po.setPicture(data.getPicture());
         po.setBelong(data.getBelong());
@@ -32,7 +36,10 @@ public class AdConverterImpl implements AdConverter {
         }
         Ad po = new Ad();
         // 基础信息
-        po.setAdId(data.getAdId());
+        po.setAreaId(null);
+        if (po.getBelong().equals(AdBlong.STORE.getCode())) {
+            po.setAreaId(data.getAreaId());
+        }
         po.setAreaId(data.getAreaId());
         po.setType(data.getType());
         po.setPicture(data.getPicture());
diff --git a/ruoyi-web/src/main/java/com/ruoyi/web/bst/AdController.java b/ruoyi-web/src/main/java/com/ruoyi/web/bst/AdController.java
index 6aa9285..9aff003 100644
--- a/ruoyi-web/src/main/java/com/ruoyi/web/bst/AdController.java
+++ b/ruoyi-web/src/main/java/com/ruoyi/web/bst/AdController.java
@@ -114,6 +114,7 @@ public class AdController extends BaseController
         if (!adValidator.canEdit(ad.getAdId())){
             return AjaxResult.error("您没有权限修改id为" + ad.getAdId() + "的广告信息");
         }
+        adConverter.toPoByUpdate(ad);
         return toAjax(adService.updateAd(ad));
     }