Merge branch 'feature-20240104' of https://gitee.com/yunqiang_technology/floatomcloud into feature-20240104

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>

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);
     }
 

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>