修改聊天bug

alien-entity/src/main/java/shop/alien/mapper/LifeMessageMapper.java

@@ -42,12 +42,28 @@ public interface LifeMessageMapper extends BaseMapper<LifeMessage> {
             "    from message " +
             ") " +
             "select message.id, message.type, message.phoneId, message.content, message.created_time createdTime, message.is_read, " +
-            "       if (message.flag = 'user', user.user_name, suser.nick_name) userName, " +
-            " IF(INSTR( #{phoneId}, 'user' ) > 0, user.user_image, suser.head_img ) user_image, "+
-            "       if (message.flag = 'user', user.id, suser.id) userId " +
+            "case "+
+            "when message.flag = 'user' then user.user_name "+
+            "when message.flag = 'store' then suser.nick_name "+
+            "when message.flag = 'lawyer' then luser.name "+
+            "else '' "+
+            "end as userName, "+
+            "case "+
+            "when INSTR(  message.phoneId, 'user' ) > 0 then user.user_image "+
+            "when INSTR(  message.phoneId, 'store' ) > 0 then suser.head_img "+
+            "when INSTR(  message.phoneId, 'lawyer' ) > 0 then luser.head_img "+
+            "else ''  "+
+            "end as user_image, "+
+            "case "+
+            "when message.flag = 'user' then user.id "+
+            "when message.flag = 'store' then suser.id "+
+            "when message.flag = 'lawyer' then luser.id "+
+            "else '' "+
+            "end as userId "+
             "from message_num message " +
             "left join life_user user on message.flag = 'user' and message.phone = user.user_phone and user.delete_flag = 0 " +
             "left join store_user suser on message.flag = 'store' and message.phone = suser.phone and suser.delete_flag = 0 " +
+            "left join lawyer_user luser on message.flag = 'lawyer' and message.phone = luser.phone and luser.delete_flag = 0 "+
             "left join store_img img on img.store_id = suser.store_id and img.img_type = '10' and img.delete_flag = 0 " +
             "${ew.customSqlSegment}")
     List<LifeMessageVo> getLifeMessagePageByPhoneId(@Param("phoneId") String phoneId, @Param(Constants.WRAPPER) QueryWrapper<LifeFansVo> dynamicsWrapper);

alien-store/src/main/java/shop/alien/store/service/impl/LifeMessageServiceImpl.java

@@ -145,9 +145,6 @@ public class LifeMessageServiceImpl extends ServiceImpl<LifeMessageMapper, LifeM
                     }
 
                     String senderId = messageVo.getPhoneId();
-                    if (senderId != null && senderId.startsWith("lawyer_")) {
-                        continue;
-                    }
                     lifeMessagePageResultList.add(messageVo);
                 }
             }