From 9ed04fce2a082cbde816c02faf84c760f1f92c6a Mon Sep 17 00:00:00 2001
From: zkr_liushenlu <liushenlu@sinosoft.com.cn>
Date: Thu, 25 Mar 2021 09:52:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E7=AB=A0=E5=B9=BF=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/content/service/impl/CmsArticleAdInfoServiceImpl.java | 2 +-
 .../main/resources/mapper/content/CmsArticleAdInfoMapper.xml    | 2 +-
 .../src/main/resources/templates/content/adverts/add.html       | 2 ++
 .../src/main/resources/templates/content/adverts/edit.html      | 2 ++
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/CmsArticleAdInfoServiceImpl.java b/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/CmsArticleAdInfoServiceImpl.java
index 4e58f9c17..4bed992d3 100644
--- a/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/CmsArticleAdInfoServiceImpl.java
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/CmsArticleAdInfoServiceImpl.java
@@ -108,7 +108,7 @@ public class CmsArticleAdInfoServiceImpl implements ICmsArticleAdInfoService {
      */
     @Override
     public int updateCmsArticleAdInfo(MultipartFile file, CmsArticleAdInfo cmsArticleAdInfo) {
-        if (!file.isEmpty()) {
+        if (file != null && !file.isEmpty()) {
             String fileName = file.getOriginalFilename();// 文件名
             String ext = fileName.substring(fileName.lastIndexOf("."), fileName.length());// 文件后缀
             String fileTime = DateUtils.getMillisecond();
diff --git a/ruoyi-content/src/main/resources/mapper/content/CmsArticleAdInfoMapper.xml b/ruoyi-content/src/main/resources/mapper/content/CmsArticleAdInfoMapper.xml
index 0a6b0034f..14b21737f 100644
--- a/ruoyi-content/src/main/resources/mapper/content/CmsArticleAdInfoMapper.xml
+++ b/ruoyi-content/src/main/resources/mapper/content/CmsArticleAdInfoMapper.xml
@@ -160,7 +160,7 @@
     <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer">
         select
         <include refid="Base_Column_List"/>
-        from article_ad_info
+        from cms_article_ad_info
         where AD_ID = #{adId,jdbcType=INTEGER}
     </select>
 
diff --git a/ruoyi-content/src/main/resources/templates/content/adverts/add.html b/ruoyi-content/src/main/resources/templates/content/adverts/add.html
index 823093020..7ff7067df 100644
--- a/ruoyi-content/src/main/resources/templates/content/adverts/add.html
+++ b/ruoyi-content/src/main/resources/templates/content/adverts/add.html
@@ -125,6 +125,8 @@
 
         function submitHandler() {
             if ($.validate.form()) {
+                // 打开遮罩层
+                $.modal.loading("请稍后...");
                 var data = new FormData();
                 data.append('adTitle', $("#adTitle").val());
                 data.append('adName', $("#adName").val());
diff --git a/ruoyi-content/src/main/resources/templates/content/adverts/edit.html b/ruoyi-content/src/main/resources/templates/content/adverts/edit.html
index 86cf17431..a8c276b2e 100644
--- a/ruoyi-content/src/main/resources/templates/content/adverts/edit.html
+++ b/ruoyi-content/src/main/resources/templates/content/adverts/edit.html
@@ -139,6 +139,8 @@
 
     function submitHandler() {
         if ($.validate.form()) {
+            // 打开遮罩层
+            $.modal.loading("请稍后...");
             var data = new FormData();
             data.append('adId', $("#adId").val());
             data.append('adTitle', $("#adTitle").val());