Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/xjrsoft/module/room/service/impl/RoomBedServiceImpl.java

@@ -317,7 +317,7 @@ public class RoomBedServiceImpl extends MPJBaseServiceImpl<RoomBedMapper, RoomBe
                 //先分配已缴费的，再分配未交费的，把已缴费的学生排序到一起
                 List<BaseStudent> studentOrderList = new ArrayList<>();
                 for (BaseStudent baseStudent : studentList) {
-                    if(payStatusMap.get(baseStudent.getUserId()) == 1){
+                    if(payStatusMap.get(baseStudent.getUserId()) != null && payStatusMap.get(baseStudent.getUserId()) == 1){
                         studentOrderList.add(baseStudent);
                     }
                 }