Merge branch 'localhost-cxy' into 'master'

fix: 通知管理修改跟我的通知首页头像修改

See merge request huang/thingsboard3.3.2!36

@@ -94,8 +94,7 @@ public class YtNoticeController extends BaseController {
         sysNoticeService.send(
             sysNoticeDTO,
             getCurrentUser().getCurrentTenantId(),
-            getCurrentUser().getCurrentUserId(),
-            getCurrentUser().getPlatformUserName());
+            getCurrentUser().getCurrentUserId());
     return sysNoticeDto == null ? ResponseEntity.badRequest().build() : ResponseEntity.ok().build();
   }
 }

@@ -130,13 +130,14 @@ public class SysNoticeServiceImpl extends AbstractBaseService<SysNoticeMapper, S
 
   @Override
   @Transactional
-  public SysNoticeDTO send(
-      SysNoticeDTO sysNoticeDTO, String tenantId, String currentUserId, String currentUserName) {
-
+  public SysNoticeDTO send(SysNoticeDTO sysNoticeDTO, String tenantId, String currentUserId) {
     SysNotice sysNotice;
     // 如果通知为空,则新增
     sysNotice = save(sysNoticeDTO, tenantId).getEntity(SysNotice.class);
-    sysNotice.setSenderName(currentUserName);
+    User user = userMapper.selectById(currentUserId);
+    if (null != user) {
+      sysNotice.setSenderName(user.getRealName());
+    }
     sysNotice.setCreator(currentUserId);
     sysNotice.setSenderDate(LocalDateTime.now());
     int update =

@@ -23,5 +23,5 @@ public interface SysNoticeService {
 
   SysNoticeDTO save(SysNoticeDTO sysNoticeDTO,String tenantId);
 
-  SysNoticeDTO send(SysNoticeDTO sysNoticeDTO,String tenantId,String currentUserId,String currentUserName);
+  SysNoticeDTO send(SysNoticeDTO sysNoticeDTO,String tenantId,String currentUserId);
 }

@@ -16,6 +16,7 @@
         <association property="user" column="receiver_id"
                      javaType="org.thingsboard.server.common.data.yunteng.dto.UserDTO">
             <result property="realName" column="real_name"/>
+            <result property="avatar" column="avatar"/>
         </association>
         <association property="sysNotice" column="notice_id"
                      javaType="org.thingsboard.server.common.data.yunteng.dto.SysNoticeDTO">
@@ -24,6 +25,7 @@
             <result property="senderName" column="sender_name"/>
             <result property="senderDate" column="sender_date"/>
             <result property="title" column="title"/>
+            <result property="content" column="content"/>
         </association>
     </resultMap>
 
@@ -45,12 +47,14 @@
                snu.update_time update_time,
                snu.tenant_id   tenant_id,
                su.real_name    real_name,
+               su.avatar   avatar,
                snu.id          id,
                sn.type AS      type,
                sn.sender_name  sender_name,
                sn.sender_date  sender_date,
                sn.id   AS      id,
-               sn.title AS     title
+               sn.title AS     title,
+               sn.content AS   content
         FROM sys_notice_user snu
                  LEFT JOIN sys_notice sn ON sn.id = snu.notice_id
                  LEFT JOIN sys_user su ON snu.receiver_id = su.id