xw 1 день тому
батько
коміт
e031e20e4c

+ 2 - 0
fs-service/src/main/java/com/fs/his/domain/FsUser.java

@@ -107,6 +107,8 @@ public class FsUser extends BaseEntity
 
     private Long companyId;
     private Long companyUserId;
+    /** 独立绑定销售ID(落表:fs_user.bind_company_user_id) */
+    private Long bindCompanyUserId;
     private String companyUserName;
 
     /** 与直播 WebSocket 参数 userType 一致:0 观众,1 具备飘屏或置顶权限的企业用户(不落库) */

+ 4 - 2
fs-user-app/src/main/java/com/fs/app/controller/UserController.java

@@ -4,6 +4,8 @@ package com.fs.app.controller;
 import cn.hutool.core.lang.Validator;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.fs.app.annotation.Login;
+import com.fs.company.domain.CompanyUser;
+import com.fs.company.service.ICompanyUserService;
 import com.fs.app.param.FsDoctorRegisterParam;
 import com.fs.app.param.FsUserEditParam;
 import com.fs.common.core.domain.R;
@@ -22,11 +24,11 @@ import com.fs.his.service.IFsDoctorService;
 import com.fs.his.service.IFsPackageService;
 import com.fs.his.service.IFsUserCouponService;
 import com.fs.his.service.IFsUserService;
-import com.fs.live.service.ILiveCommentWsUserTypeService;
 import com.fs.his.utils.PhoneUtil;
 import com.fs.his.vo.FsUserCouponCountUVO;
 import com.fs.his.vo.FsUserCouponListUVO;
 import com.fs.his.vo.UserVo;
+import com.fs.live.service.ILiveCommentWsUserTypeService;
 import com.fs.qw.service.IQwAppContactWayService;
 import com.fs.system.oss.CloudStorageService;
 import com.fs.system.oss.OSSFactory;
@@ -402,7 +404,7 @@ public class UserController extends  AppBaseController {
         if (user == null) {
             return;
         }
-        Long companyUserId = user.getCompanyUserId();
+        Long companyUserId = user.getBindCompanyUserId();
         int liveUt = liveCommentWsUserTypeService.resolveLiveCommentUserType(
                 companyUserId != null && companyUserId > 0 ? companyUserId : null);
         user.setLiveUserType(liveUt);