Pārlūkot izejas kodu

新增 自动关闭聊天室缓存

18339543638 3 gadi atpakaļ
vecāks
revīzija
2107ef0a03

+ 1 - 1
nb-admin/src/test/java/com/nb/admin/ImRoomTest.java

@@ -55,7 +55,7 @@ public class ImRoomTest {
         consult.setPatientCode("321000000");
         consult.setPatientSex(SexEnum.MAN);
         consult.setPatientName("杨志军");
-        consult.setPatientAge(32);
+//        consult.setPatientAge(32);
         consult.setDoctorId("1557292606716702722");
         consult.setDoctorNickName("唐医生");
 

+ 1 - 3
nb-im/src/main/java/com/nb/im/controller/ImRoomController.java

@@ -72,9 +72,7 @@ public class ImRoomController implements BaseSaveController<ImRoomEntity,String>
                 .eq(ImRoomEntity::getAssistId, source.getAssistId())
                 .eq(ImRoomEntity::getDoctorId, source.getDoctorId())
                 .eq(ImRoomEntity::getPatientId, source.getPatientId())
-                .nested(i->i.eq(ImRoomEntity::getStatus, ImStatusEnum.WAITING)
-                        .or()
-                        .eq(ImRoomEntity::getStatus,ImStatusEnum.SUCCESS))
+                .in(ImRoomEntity::getStatus,ImStatusEnum.WAITING,ImStatusEnum.SUCCESS)
                 .last("limit 1"));
         if(chatRoom==null&&source.isAutoCreate()){
             source.setTotalCount(0);