合并

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpAnnouncementServiceImpl.java

@@ -74,9 +74,9 @@ private  TpAnnouncementMapper tpAnnouncementMapper;
             AnnouncementTable announcementTable = new AnnouncementTable();
             BeanUtils.copyProperties(e, announcementTable);
             //创建人
-            String createUserName = userMapper.selectByIdCreateUserName(e.getUpdateUser());
+            String createUserName = userMapper.selectByIdUserName(e.getUpdateUser());
             //修改人
-            String updateDateName = userMapper.selectByIdCreateUserName(e.getCreateUser());
+            String updateDateName = userMapper.selectByIdUserName(e.getCreateUser());
             announcementTable.setCreateUserName(createUserName);
             announcementTable.setUpdateDateName(updateDateName);
             return announcementTable;
@@ -155,9 +155,8 @@ private  TpAnnouncementMapper tpAnnouncementMapper;
 //                        String announcementimg=tpAnnouncement.getAnnouncementCarouselImg();
 //                        tpAnnouncement.setAnnouncementCarouselImg( "".equals(announcementimg)?null:announcementimg);
                         tpAnnouncement.setCommunityId(communityId);
-                        tpAnnouncement.setCreateDate(new Date());
                         tpAnnouncement.setUpdateUser(userId);
-                        tpAnnouncement.setCreateUser(userId);
+                        tpAnnouncement.setCreateUser(null);
                         tpAnnouncement.setUpdateDate(new Date());
                         tpAnnouncementMapper.updateTpAnnouncement(tpAnnouncement);
 

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

@@ -31,7 +31,7 @@
         width="55"/>
       <el-table-column prop="id" label="编号" align="center"/>
       <el-table-column prop="announcementTitle" label="标题" align="center" >
-        <template slot-scope="scope"><a><span style="text-decoration: underline; color: blue" @click="clickTitle(scope.row.id)">{{ scope.row.announcementTitle }}</span></a></template>
+        <template slot-scope="scope"><a><span style="color: #63B8FF" @click="clickTitle(scope.row.id)">{{ scope.row.announcementTitle }}</span></a></template>
       </el-table-column>
       <el-table-column prop="viewCount" label="查看数量" align="center"/>
       <el-table-column prop="sort" label="权重" align="center"/>