消息推送问题

lift-common/src/main/java/cn.com.ty.lift.common/model/PushMessage.java

@@ -26,7 +26,7 @@ public class PushMessage implements Serializable {
 
     private String title;
     private String content;
-    private Hashtable<Long,Integer> users = new Hashtable<>();
+    private Hashtable<Long, Integer> users = new Hashtable<>();
     private List<String> toList = new ArrayList<>();
     //the count of try again. Increase 1 for each failure, maximum times 100
     private int tryCount = 0;
@@ -614,18 +614,26 @@ public class PushMessage implements Serializable {
 
     /**
      * 将用户id和设备类型传到消息中间件中，方便消息中心功能来保存
+     *
      * @param pushUserInfos 用户信息列表
      */
     private void resetUsers(List<PushUserInfo> pushUserInfos) {
         users.clear();
-        pushUserInfos.forEach(pushUserInfo -> users.put(pushUserInfo.getUserId(),pushUserInfo.getDeviceModel()));
+        pushUserInfos.forEach(pushUserInfo -> {
+                    if (pushUserInfo.getDeviceModel() != null) {
+                        users.put(pushUserInfo.getUserId(), pushUserInfo.getDeviceModel());
+                    }
+                }
+        );
     }
+
     /**
      * 将用户id和设备类型传到消息中间件中，方便消息中心功能来保存
+     *
      * @param pushUserInfo 用户信息列表
      */
     private void resetUsers(PushUserInfo pushUserInfo) {
         users.clear();
-        users.put(pushUserInfo.getUserId(),pushUserInfo.getDeviceModel());
+        users.put(pushUserInfo.getUserId(), pushUserInfo.getDeviceModel());
     }
 }