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

src/main/java/com/xjrsoft/module/oa/controller/NewsController.java

@@ -369,8 +369,8 @@ public class NewsController {
 
                 //公告发给非全体的
                 Long notReadCountProclamation = newsRelationService.count(Wrappers.<NewsRelation>query().lambda()
-                        .eq(NewsRelation::getReadMark, 2)
-                        .eq(NewsRelation::getUserId, 2)
+                        .eq(NewsRelation::getReadMark, 0)
+                        .eq(NewsRelation::getUserId, StpUtil.getLoginIdAsLong())
                         .inSql(NewsRelation::getNewsId, "select id from xjr_oa_news where delete_mark = 0 and type_id = 2 and (send_range = 2 or send_range = 3) AND (send_end_date > '" + LocalDateTime.now() + "' OR send_end_date IS NULL)"));
 
                 MPJLambdaWrapper<News> queryNews = new MPJLambdaWrapper<>();
@@ -446,8 +446,8 @@ public class NewsController {
 
         //公告发给非全体的
         Long notReadCountProclamation = newsRelationService.count(Wrappers.<NewsRelation>query().lambda()
-                .eq(NewsRelation::getReadMark, 2)
-                .eq(NewsRelation::getUserId, 2)
+                .eq(NewsRelation::getReadMark, 0)
+                .eq(NewsRelation::getUserId, StpUtil.getLoginIdAsLong())
                 .inSql(NewsRelation::getNewsId, "select id from xjr_oa_news where delete_mark = 0 and type_id = 2 and status = 2 and (send_range = 2 or send_range = 3) AND (send_end_date > '" + LocalDateTime.now() + "' OR send_end_date IS NULL)"));
 
         Long notReadCount = notReadCountNews + notReadCountProclamationToAll + notReadCountProclamation;

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

@@ -128,6 +128,17 @@ public class RoomBedServiceImpl extends MPJBaseServiceImpl<RoomBedMapper, RoomBe
 
         RoomBed roomBed = roomBedMapper.selectById(id);
         roomBedMapper.update(roomBed, updateWrapper);
+        //如果寝室的人只剩下一个班级，将混合寝室改为否
+        List<Long> roomIds = new ArrayList<>();
+        roomIds.add(roomBed.getRoomId());
+        List<RoomClassCountVo> classCountVoList = roomMapper.getRoomClassCount(roomIds);
+        for (RoomClassCountVo roomClassCountVo : classCountVoList) {
+            if(roomClassCountVo.getClassCount() == 1){
+                Room updRoom = roomMapper.selectById(roomClassCountVo.getId());
+                updRoom.setIsMax(0);
+                roomMapper.updateById(updRoom);
+            }
+        }
         return true;
     }
 
@@ -446,6 +457,18 @@ public class RoomBedServiceImpl extends MPJBaseServiceImpl<RoomBedMapper, RoomBe
             setId(dto.getBedId());
             setStudentUserId(dto.getStudentUserId());
         }});
+
+        //如果寝室的人是多个班级，将混合寝室改为是
+        List<Long> roomIds = new ArrayList<>();
+        roomIds.add(roomBed.getRoomId());
+        List<RoomClassCountVo> classCountVoList = roomMapper.getRoomClassCount(roomIds);
+        for (RoomClassCountVo roomClassCountVo : classCountVoList) {
+            if(roomClassCountVo.getClassCount() > 1){
+                Room updRoom = roomMapper.selectById(roomClassCountVo.getId());
+                updRoom.setIsMax(1);
+                roomMapper.updateById(updRoom);
+            }
+        }
         return true;
     }
 }