广告管理修改时检验逻辑修改

imcs-bt-be/imcs-business-biz/src/main/resources/mapper_business/base/advertisement/AdvertisementMapper.xml

@@ -137,6 +137,10 @@
                         #{item.deliveryEquId, jdbcType=BIGINT}
                     </foreach>
                 </if>
+                <!-- 广告管理修改时排除当前广告的校验 -->
+                <if test="model.id != null">
+                    and ba.id != #{model.id, jdbcType=BIGINT}
+                </if>
                 <if test="model.deliveryEndTime != null">
                     and ba.delivery_end_time > #{model.deliveryEndTime, jdbcType=TIMESTAMP}
                 </if>

imcs-bt-be/imcs-business-controller/src/main/java/com/github/zuihou/business/controller/advertisement/AdvertisementController.java

@@ -154,6 +154,7 @@ public class AdvertisementController extends SuperController<AdvertisementServic
             return;
         }
         Advertisement adBuild = Advertisement.builder().build();
+        adBuild.setId(advertisement.getId());
         adBuild.setAdvertisementEquList(advertisement.getAdvertisementEquList());
         adBuild.setAdStatus("1");
         adBuild.setDeliveryEndTime(advertisement.getDeliveryStartTime());