|
@@ -205,16 +205,18 @@ public class MqttSubHandle {
|
|
|
|
|
|
// 需要发送提示的 有 当前设备拥有者, 被分享者, 以及 对当前设备 具有管理权限的 web管理用户
|
|
// 需要发送提示的 有 当前设备拥有者, 被分享者, 以及 对当前设备 具有管理权限的 web管理用户
|
|
// 1 小程序拥有者
|
|
// 1 小程序拥有者
|
|
- UserInfo userInfo = userService.queryById(userId);
|
|
|
|
- SendMsgUserDto msgUserDto = new SendMsgUserDto();
|
|
|
|
- msgUserDto.setUserId(userId);
|
|
|
|
- msgUserDto.setPhone(userInfo.getPhone());
|
|
|
|
- msgUserDto.setUnionId(userInfo.getUnionId());
|
|
|
|
- WxRelation wxRelation = wxRelationService.queryOneByUnionId(userInfo.getUnionId());
|
|
|
|
- if (wxRelation != null) {
|
|
|
|
- msgUserDto.setFwhOpenId(wxRelation.getFwhOpenId());
|
|
|
|
|
|
+ if (userId != null) {
|
|
|
|
+ UserInfo userInfo = userService.queryById(userId);
|
|
|
|
+ SendMsgUserDto msgUserDto = new SendMsgUserDto();
|
|
|
|
+ msgUserDto.setUserId(userId);
|
|
|
|
+ msgUserDto.setPhone(userInfo.getPhone());
|
|
|
|
+ msgUserDto.setUnionId(userInfo.getUnionId());
|
|
|
|
+ WxRelation wxRelation = wxRelationService.queryOneByUnionId(userInfo.getUnionId());
|
|
|
|
+ if (wxRelation != null) {
|
|
|
|
+ msgUserDto.setFwhOpenId(wxRelation.getFwhOpenId());
|
|
|
|
+ }
|
|
|
|
+ sendList.add(msgUserDto);
|
|
}
|
|
}
|
|
- sendList.add(msgUserDto);
|
|
|
|
|
|
|
|
// 2 todo 被分享者
|
|
// 2 todo 被分享者
|
|
|
|
|