From dd429809cad570757576ed05c53eb2bd128a67cb Mon Sep 17 00:00:00 2001
From: SjS <email@example.com>
Date: Tue, 8 Apr 2025 16:31:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B9=BF=E5=91=8Abug?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/ruoyi/bst/ad/mapper/AdMapper.xml    | 8 ++++----
 .../java/com/ruoyi/bst/ad/service/impl/AdServiceImpl.java | 5 -----
 .../src/main/java/com/ruoyi/web/bst/AdController.java     | 3 +++
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/ad/mapper/AdMapper.xml b/ruoyi-service/src/main/java/com/ruoyi/bst/ad/mapper/AdMapper.xml
index 3eb7daf..297422e 100644
--- a/ruoyi-service/src/main/java/com/ruoyi/bst/ad/mapper/AdMapper.xml
+++ b/ruoyi-service/src/main/java/com/ruoyi/bst/ad/mapper/AdMapper.xml
@@ -86,11 +86,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertAd" parameterType="Ad" useGeneratedKeys="true" keyProperty="adId">
         insert into bst_ad
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="storeId != null">store_id,</if>
             <if test="type != null">type,</if>
+            <if test="belong != null">belong,</if>
             <if test="picture != null">picture,</if>
             <if test="url != null">url,</if>
-            <if test="storeId != null">store_id,</if>
-            <if test="belong != null">belong,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
@@ -100,10 +100,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="urlType != null and urlType != ''">url_type,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="type != null">#{type},</if>
-            <if test="picture != null">#{picture},</if>
             <if test="storeId != null">#{storeId},</if>
+            <if test="type != null">#{type},</if>
             <if test="belong != null">#{belong},</if>
+            <if test="picture != null">#{picture},</if>
             <if test="url != null">#{url},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/ad/service/impl/AdServiceImpl.java b/ruoyi-service/src/main/java/com/ruoyi/bst/ad/service/impl/AdServiceImpl.java
index b5fa61a..cc88821 100644
--- a/ruoyi-service/src/main/java/com/ruoyi/bst/ad/service/impl/AdServiceImpl.java
+++ b/ruoyi-service/src/main/java/com/ruoyi/bst/ad/service/impl/AdServiceImpl.java
@@ -79,11 +79,6 @@ public class AdServiceImpl implements AdService
     public int insertAd(Ad ad)
     {
         ad.setCreateTime(DateUtils.getNowDate());
-        if (SecurityUtils.isSysAdmin()){
-            ad.setBelong(AdBlong.ADMIN.getCode());
-        }else {
-            ad.setBelong(AdBlong.STORE.getCode());
-        }
         return adMapper.insertAd(ad);
     }
 
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 7ffd514..23f1c50 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
@@ -3,6 +3,7 @@ package com.ruoyi.web.bst;
 import com.ruoyi.bst.ad.domain.Ad;
 import com.ruoyi.bst.ad.domain.AdQuery;
 import com.ruoyi.bst.ad.domain.AdVO;
+import com.ruoyi.bst.ad.enums.AdBlong;
 import com.ruoyi.bst.ad.service.AdConverter;
 import com.ruoyi.bst.ad.service.AdService;
 import com.ruoyi.bst.ad.service.AdValidator;
@@ -87,9 +88,11 @@ public class AdController extends BaseController
     public AjaxResult add(@RequestBody Ad ad)
     {
         ad.setStoreId(getUserId());
+        ad.setBelong(AdBlong.ADMIN.getCode());
         // 若当前商户不是超级管理员只能够创建一个广告
         if (!SecurityUtils.isSysAdmin()){
             AdVO vo = adService.selectOne(adConverter.toAdQueryByCreate(ad));
+            ad.setBelong(AdBlong.ADMIN.getCode());
             ServiceUtil.assertion(vo!=null,"该商户可创建广告已达上限");
         }
         return toAjax(adService.insertAd(ad));