From 87709a8b0ad33f00e2eeaaff6697f7b8c511d3a5 Mon Sep 17 00:00:00 2001
From: "382696293@qq.com" <382696293@qq.com>
Date: Wed, 31 Jan 2024 18:09:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=B9=E7=AA=97=E7=AE=A1=E7=90=86-=E6=8E=A8?=
 =?UTF-8?q?=E9=80=81=E9=A2=91=E6=AC=A1=E8=AE=BE=E7=BD=AE=E8=87=AA=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89=E9=A2=91=E6=AC=A1=E5=90=8E=EF=BC=8C=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=88=90=E6=AF=8F=E6=AC=A1=E6=88=96=E6=B0=B8=E4=B9=85=E4=B8=80?=
 =?UTF-8?q?=E6=AC=A1=E6=97=B6=EF=BC=8C=E5=88=97=E8=A1=A8=E8=BF=98=E6=98=AF?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E8=87=AA=E5=AE=9A=E4=B9=89=E9=A2=91=E6=AC=A1?=
 =?UTF-8?q?=E7=9A=84=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/SiteInfoMapper.xml       |  4 ++--
 .../system/service/impl/SiteInfoServiceImpl.java       |  5 +++++
 flossom-ui/src/views/system/siteInfo/index.vue         | 10 +++-------
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/flossom-common/flossom-common-core/src/main/resources/mapper/SiteInfoMapper.xml b/flossom-common/flossom-common-core/src/main/resources/mapper/SiteInfoMapper.xml
index e035d12..2c43852 100644
--- a/flossom-common/flossom-common-core/src/main/resources/mapper/SiteInfoMapper.xml
+++ b/flossom-common/flossom-common-core/src/main/resources/mapper/SiteInfoMapper.xml
@@ -206,10 +206,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             site_end_time = #{siteEndTime},
             user_register_start_time = #{userRegisterStartTime},
             user_register_end_time = #{userRegisterEndTime},
+            push_number = #{pushNumber},
+            push_timer = #{pushTimer},
             <if test="openType != null">open_type = #{openType},</if>
             <if test="pushType != null">push_type = #{pushType},</if>
-            <if test="pushNumber != null">push_number = #{pushNumber},</if>
-            <if test="pushTimer != null">push_timer = #{pushTimer},</if>
             <if test="showWechatTag != null">show_wechat_tag = #{showWechatTag},</if>
             <if test="showWechatTagId != null">show_wechat_tag_id = #{showWechatTagId},</if>
             <if test="showCompanyTag != null">show_company_tag = #{showCompanyTag},</if>
diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SiteInfoServiceImpl.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SiteInfoServiceImpl.java
index 7d4f105..4ad1678 100644
--- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SiteInfoServiceImpl.java
+++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SiteInfoServiceImpl.java
@@ -491,6 +491,11 @@ public class SiteInfoServiceImpl implements ISiteInfoService
 
         // 保存新的关联关系
         this.commonHandlerRelation(siteInfo,showWechatTagNew,showCompanyTagNew,forbidWechatTagNew,forbidCompanyTagNew,channelListNew,handlerWechatTagNew,handlerCompanyTagNew,wxInstrumentList);
+        if(SitePushTypeEnum.CUSTOM.getCode() != siteInfo.getPushType()) {
+            siteInfo.setPushNumber(null);
+            siteInfo.setPushTimer(null);
+            siteInfo.setPushTimerArray(null);
+        }
         return siteInfoMapper.updateSiteInfo(siteInfo);
     }
 
diff --git a/flossom-ui/src/views/system/siteInfo/index.vue b/flossom-ui/src/views/system/siteInfo/index.vue
index 073560b..9ac50fe 100644
--- a/flossom-ui/src/views/system/siteInfo/index.vue
+++ b/flossom-ui/src/views/system/siteInfo/index.vue
@@ -341,7 +341,7 @@
 					</el-select>
 				</el-form-item>
 				<el-form-item label="推送次数" prop="pushType">
-					<el-radio-group v-model="form.pushType" @input="pushTypeChange">
+					<el-radio-group v-model="form.pushType" >
 						<el-radio :label="1">永久一次</el-radio>
 						<el-radio :label="2">每次进入</el-radio>
 						<el-radio :label="3">自定义频次</el-radio>
@@ -933,6 +933,7 @@ export default {
 							this.getList()
 						})
 					}
+          this.$refs.upload.clearFiles();
 				}
 			})
 		},
@@ -993,12 +994,7 @@ export default {
 				},
 				`info_${new Date().getTime()}.xlsx`
 			)
-		},
-    pushTypeChange() {
-        this.form.pushTimerArray = null;
-        this.form.pushTimer = null;
-        this.form.pushNumber = 1;
-    }
+		}
 	},
 }
 </script>