fix 修复一些Bug

nb-im/src/main/java/com/nb/im/service/dto/ImRoomDetailDto.java

@@ -38,7 +38,7 @@ public class ImRoomDetailDto {
     @ApiModelProperty(value = "病人性别",readOnly = true)
     private SexEnum patientSex;
 
-    @ApiModelProperty(value = "看护位置",allowableValues = "0（院内管理） 1（居家管理）",required = true)
+    @ApiModelProperty(value = "看护位置 0（院内管理） 1（居家管理）",required = true)
     private ClinicManageEnum manageType;
 
     @ApiModelProperty(value = "看护人id",readOnly = true)

nb-im/src/main/resources/mapper/im/ImRoomMapper.xml

@@ -33,11 +33,14 @@
         r.last_msg_time as last_msg_time,
         r.sponsor_type as sponsor_type,
         r.total_count as total_count,
+        <if test="query.assistId != null">
+            ru.nickname as doctorNickname,
+            ru.user_id as doctorId,
+        </if>
         rm.payload as payload,
         rm.msg_type as msg_type,
-        rm.operation_type as operation_type,
-        ru.nickname as doctorNickname,
-        ru.user_id as doctorId
+        rm.operation_type as operation_type
+
         from
         (select * from im_room
         <where>

nb-service-api/app-assistant-api/src/main/java/com/nb/app/assistant/api/entity/AssistantUserBindEntity.java

@@ -1,6 +1,5 @@
 package com.nb.app.assistant.api.entity;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.nb.app.assistant.api.enums.ApplyEnum;
@@ -15,8 +14,6 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
 
-import java.util.Date;
-
 /**
  * @author lifang
  * @version 1.0.0
@@ -71,10 +68,10 @@ public class AssistantUserBindEntity extends GenericEntity<String> {
     @ApiModelProperty(value = "是否为默认看护")
     private Boolean default_;
 
-    @ApiModelProperty(value = "申请类型",required = true,allowableValues = "0（手动申请） 1（邀请码申请）")
+    @ApiModelProperty(value = "申请类型",required = true,example = " 0（手动申请） 1（邀请码申请）")
     private ApplyEnum applyType;
 
-    @ApiModelProperty(value = "绑定状态",required = true,allowableValues = "0（等待医生进行绑定操作） 1（绑定成功） 2（拒绝） 3（自动断开） 4（手动断开）")
+    @ApiModelProperty(value = "绑定状态",required = true,example = "0（等待医生进行绑定操作） 1（绑定成功） 2（拒绝） 3（自动断开） 4（手动断开）")
     private BindEnum status;
 
     @ApiModelProperty(value = "解除绑定人，当与userId相同时，即本人解除绑定关系，当不同时，即由医生解除绑定关系")

nb-service/app-assistant/src/main/java/com/nb/app/assistant/auth/AssistantPhoneGranter.java

@@ -2,6 +2,7 @@ package com.nb.app.assistant.auth;
 
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.extra.spring.SpringUtil;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.nb.app.assistant.entity.AssistantUserEntity;
 import com.nb.app.assistant.enums.CaptchaEnum;
@@ -59,6 +60,7 @@ public class AssistantPhoneGranter implements IAuthGranter {
        //自动注册
         if(user==null){
             user=new AssistantUserEntity();
+            user.setId(IdWorker.getIdStr());
             user.setPhone(source.getUsername());
             user.setNickname(source.getUsername());
             user.setPassword(SecurityUtil.encryptPassword("123456"));