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}, open_type = #{openType}, push_type = #{pushType}, - push_number = #{pushNumber}, - push_timer = #{pushTimer}, show_wechat_tag = #{showWechatTag}, show_wechat_tag_id = #{showWechatTagId}, show_company_tag = #{showCompanyTag}, 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 @@ - + 永久一次 每次进入 自定义频次 @@ -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; - } + } }, }