Merge branch 'dev' into local-slave

nb-im/src/main/java/com/nb/im/controller/ImRoomController.java

@@ -2,6 +2,7 @@ package com.nb.im.controller;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
@@ -85,16 +86,17 @@ public class ImRoomController implements BaseSaveController<ImRoomEntity,String>
         if(Boolean.TRUE.equals(source.isAutoCreate())&&StrUtil.isEmpty(source.getDoctorNickname())){
             throw new CustomException("医生昵称不可为空");
         }
+        Date dateTime= DateUtil.offsetDay(new Date(),-30);
         ImRoomEntity chatRoom = imRoomService.getOne(new QueryWrapper<ImRoomEntity>()
                 .lambda()
                 .eq(ImRoomEntity::getAssistId, source.getAssistId())
                 .eq(ImRoomEntity::getDoctorId, source.getDoctorId())
                 .eq(ImRoomEntity::getPatientId, source.getPatientId())
-                .in(ImRoomEntity::getStatus,ImStatusEnum.WAITING,ImStatusEnum.SUCCESS)
+//                .in(ImRoomEntity::getStatus,ImStatusEnum.WAITING,ImStatusEnum.SUCCESS)
                 .nested(r->
-                    r .gt(ImRoomEntity::getCreateTime,System.currentTimeMillis() - TimeUnit.DAYS.toMillis(30))
+                    r .gt(ImRoomEntity::getCreateTime,dateTime)
                             .or()
-                            .gt(ImRoomEntity::getSuccessTime,System.currentTimeMillis() - TimeUnit.DAYS.toMillis(30))
+                            .gt(ImRoomEntity::getSuccessTime,dateTime)
                 )
                 .orderByDesc(ImRoomEntity::getCreateTime)
                 .last("limit 1"));

nb-service/app-assistant/src/main/java/com/nb/app/assistant/service/LocalAssistantUserBindService.java

@@ -341,7 +341,10 @@ public class LocalAssistantUserBindService extends BaseService<AssistantUserBind
                     DelayMessageProperties.of(TimeUnit.HOURS, 24));
             delayMessageManager.add(delayMessage);
         }
-         String clinicId = patientDetail.getClinic().getId();
+        if(ObjectUtil.isNull(patientDetail)||ObjectUtil.isNull(patientDetail.getClinic())){
+            return result;
+        }
+        String clinicId = patientDetail.getClinic().getId();
         if(ObjectUtil.isNotNull(source.getManage())){
             patientClient.setManageType(clinicId,source.getManage());
         }

nb-service/app-doctor/src/main/java/com/nb/app/doctor/auth/AppDoctorUserAccountOperator.java

@@ -1,6 +1,9 @@
 package com.nb.app.doctor.auth;
 
+import cn.dev33.satoken.exception.NotLoginException;
+import cn.dev33.satoken.stp.StpLogic;
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -63,11 +66,16 @@ public class AppDoctorUserAccountOperator implements IAccountOperator<DoctorUser
 
     @Override
     public AccountInfoVO<DoctorUserVo> getAccountInfo() {
+        AccountInfoVO<DoctorUserVo> result = new AccountInfoVO();
         LoginUser<String> loginUser = SecurityUtil.getLoginUser();
         AppDoctorUserEntity appDoctorUser = doctorUserService.getById(loginUser.getId());
+        StpLogic stpLogic = SecurityUtil.getStpLogic();
+        if(ObjectUtil.isNull(appDoctorUser)){
+            stpLogic.logout();
+            stpLogic.checkLogin();
+            return result;
+        }
         DoctorUserVo vo = BeanUtil.copyProperties(appDoctorUser, DoctorUserVo.class);
-
-        AccountInfoVO<DoctorUserVo> result = new AccountInfoVO();
         result.setExtendFields(JSONUtil.parseObj(Optional.ofNullable(vo).orElse(new DoctorUserVo()))
         );
         result.setAvatar(appDoctorUser.getAvatar());