合并

CODE/smart-community/property-api/src/main/resources/mapper/TpAnnouncementMapper.xml

@@ -15,7 +15,7 @@
       tp_announcement
       <where>
         <if test="record.id != null and record.id != ''" >
-          AND id =  #{record.id,jdbcType=INTEGER}
+          AND id like concat('%',#{record.id,jdbcType=INTEGER},'%')
         </if>
         <if test="record.announcementTitle != null and record.announcementTitle != ''" >
           AND announcement_title like concat('%',#{record.announcementTitle,jdbcType=VARCHAR},'%')

VUECODE/smart-property-manage/src/views/social/activity/add/index.vue

@@ -167,6 +167,11 @@ export default {
         spinner: 'el-icon-loading',
         background: 'rgba(0, 0, 0, 0.7)'
       })
+      if(this.ruleForm.activityCarouselImg<=0){
+            this.$message.error('轮播图未上传')
+            loading.close()
+            return    
+          }
       if (this.ruleForm.activityContent.length <= 0 && this.ruleForm.contentImg.length <= 0) {
         this.$message.error('活动内容描述 和 活动配图至少要存在一个!')
         loading.close()

VUECODE/smart-property-manage/src/views/social/announcement/add.vue

@@ -86,6 +86,10 @@ export default {
       })
       this.$refs[formName].validate((valid) => {
         if (valid) {
+          if(this.ruleForm.announcementCarouselImg<=0){
+            this.$message.error('轮播图未上传')
+            return    
+          }
           if (this.ruleForm.announcementContent.length <= 0 && this.ruleForm.contentImg.length <= 0) {
             this.$message.error('公告内容描述 和 公告配图至少要存在一个!')
             return 

VUECODE/smart-property-manage/src/views/social/announcement/edit.vue

@@ -158,7 +158,7 @@ export default {
       this.ruleForm.sort = value
       console.log(value)
     },
-    getById(id) { // 页面初始化后调用此方法根据ID获取活动信息
+    getById(id) { // 页面初始化后调用此方法根据ID获取公告信息
       this.ruleForm.id=this.$route.params.id
       this.$store.dispatch('AnnouncementById', this.ruleForm).then((res) => {
       const resData = res.data