123213

ruoyi-modules/ruoyi-main/src/main/java/org/dromara/main/service/impl/CsMessageServiceImpl.java

@@ -381,9 +381,13 @@ public class CsMessageServiceImpl implements ICsMessageService {
         if (session == null || session.getSessionType() == null || session.getSessionType() != 2) {
             return null;
         }
+        SysUser user = session.getFromUserId() != null ? sysUserMapper.selectById(session.getFromUserId()) : null;
+        String tenantId = user != null ? user.getTenantId() : null;
         return mainCompanyApplyMapper.selectOne(
             Wrappers.lambdaQuery(MainCompanyApply.class)
                 .and(wrapper -> wrapper
+                    .eq(StrUtil.isNotBlank(tenantId), MainCompanyApply::getTenantId, tenantId)
+                    .or()
                     .eq(MainCompanyApply::getTenantId, String.valueOf(session.getFromUserId()))
                     .or()
                     .eq(MainCompanyApply::getId, session.getFromUserId())

ruoyi-modules/ruoyi-main/src/main/java/org/dromara/main/service/impl/CsSessionServiceImpl.java

@@ -290,6 +290,9 @@ public class CsSessionServiceImpl implements ICsSessionService {
         if (vo == null) {
             return null;
         }
+        if (StringUtils.isNotBlank(vo.getFromUserAvatar())) {
+            return vo.getFromUserAvatar();
+        }
         // 小程序用户（sessionType=1）：从学员表获取头像
         if (vo.getSessionType() != null && vo.getSessionType() == 1 && vo.getFromUserId() != null) {
             MainStudent student = mainStudentMapper.selectById(vo.getFromUserId());
@@ -299,9 +302,13 @@ public class CsSessionServiceImpl implements ICsSessionService {
         }
         // 商家用户（sessionType=2）：从企业申请表获取头像
         if (vo.getSessionType() != null && vo.getSessionType() == 2) {
+            SysUser user = vo.getFromUserId() != null ? sysUserMapper.selectById(vo.getFromUserId()) : null;
+            String tenantId = user != null ? user.getTenantId() : null;
             MainCompanyApply companyApply = mainCompanyApplyMapper.selectOne(
                 Wrappers.lambdaQuery(MainCompanyApply.class)
                     .and(wrapper -> wrapper
+                        .eq(StringUtils.isNotBlank(tenantId), MainCompanyApply::getTenantId, tenantId)
+                        .or()
                         .eq(MainCompanyApply::getTenantId, String.valueOf(vo.getFromUserId()))
                         .or()
                         .eq(MainCompanyApply::getId, vo.getFromUserId())