消息推送接口修改

tenant/organization/src/main/java/com/jzg/organization/controller/MessageController.java

@@ -74,7 +74,8 @@ public class MessageController extends BaseController {
         String userName = getUserName();
         SysUser sysUser = userService.getOne(new LambdaQueryWrapper<SysUser>()
                 .eq(SysUser::getMobile, userName));
-        return HttpResult.ok(messageService.getMessageCount(sysUser.getId()));
+        // userid 传手机号，因为消息发的都是手机号
+        return HttpResult.ok(messageService.getMessageCount(userName));
     }
 
     /**
@@ -92,7 +93,7 @@ public class MessageController extends BaseController {
         );
         if(StringUtils.isNotBlank(param.getId())){
             LambdaUpdateWrapper<SysMessageUser>  wrapper = new LambdaUpdateWrapper<>();
-            wrapper.eq(SysMessageUser::getUserId, info.getId())
+            wrapper.eq(SysMessageUser::getUserId, userName)
                     .eq(SysMessageUser::getMessageId, param.getId())
                     .set(SysMessageUser::getIsRead, 1);
             messageUserService.update(wrapper);
@@ -106,7 +107,7 @@ public class MessageController extends BaseController {
                 List<SysMessage> messages = messageService.list(wrapper);
                 List<String> messageIds = messages.stream().map(SysMessage::getId).collect(Collectors.toList());
                 LambdaUpdateWrapper<SysMessageUser> wrapper2 = new LambdaUpdateWrapper<>();
-                wrapper2.eq(SysMessageUser::getUserId, info.getId())
+                wrapper2.eq(SysMessageUser::getUserId, userName)
                         .in(SysMessageUser::getMessageId, messageIds)
                         .set(SysMessageUser::getIsRead, 1);
                 messageUserService.update(wrapper2);