总后台（全量）、销售公司（归属数据）可查询、导出、转接、继承直播用户注册绑定记录

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

@@ -179,6 +179,9 @@ public class FsUser extends BaseEntity
      */
     private String appId;
 
+    /** 直播归属销售ID */
+    private Long bindCompanyUserId;
+
 
     /** 推广上级用户ID */
     private Long spreadUserId;

fs-service/src/main/java/com/fs/his/mapper/FsUserMapper.java

@@ -86,7 +86,7 @@ public interface FsUserMapper
      */
     public int deleteFsUserByUserIds(Long[] userIds);
     @Select({"<script> " +
-                "select f1.*,f2.nick_name tui_name,f2.phone tui_phone FROM fs_user f1 LEFT JOIN fs_user f2 ON f1.tui_user_id =f2.user_id "+
+                "select f1.*,f2.nick_name tui_name,f2.phone tui_phone,CONCAT(cu.nick_name,'-',cu.user_name) as bindCompanyUserNickName FROM fs_user f1 LEFT JOIN fs_user f2 ON f1.tui_user_id =f2.user_id LEFT JOIN company_user cu ON cu.user_id = f1.bind_company_user_id "+
             " where f1.is_del=0 "+
             "  <if test=\"nickName != null  and nickName != ''\"> and f1.nick_name like concat( #{nickName}, '%')</if>\n" +
             "            <if test=\"avatar != null  and avatar != ''\"> and f1.avatar = #{avatar}</if>\n" +
@@ -94,6 +94,7 @@ public interface FsUserMapper
             "            <if test=\"status != null \"> and f1.status = #{status}</if>\n" +
             "            <if test=\"isBuy != null \"> and f1.is_buy = #{isBuy}</if>\n" +
             "            <if test=\"userId != null \"> and f1.user_id = #{userId}</if>\n" +
+            "            <if test=\"bindCompanyUserId != null \"> and f1.bind_company_user_id=#{bindCompanyUserId}</if>\n" +
             "            <if test=\"tuiUserId != null  and tuiUserId != ''\"> and f1.tui_user_id = #{tuiUserId}</if>\n" +
             "            <if test=\"tuiTime != null \"> and f1.tui_time = #{tuiTime}</if>\n" +
             "            <if test=\"userCode != null  and userCode != ''\"> and f1.user_code = #{userCode}</if>\n" +
@@ -154,10 +155,11 @@ public interface FsUserMapper
     @Select("select * from fs_user where phone=#{phone} limit 1")
     FsUser selectFsUserByPhoneLimitOne(String phone);
     @Select({"<script> " +
-            "select distinct f1.*,f2.nick_name tui_name,f2.phone tui_phone FROM company_user_user cuu LEFT JOIN fs_user f1 ON cuu.user_id =f1.user_id left JOIN fs_user f2 ON f1.tui_user_id =f2.user_id"+
+            "select distinct f1.*,f2.nick_name tui_name,f2.phone tui_phone,CONCAT(cu.nick_name,'-',cu.user_name) as bindCompanyUserNickName FROM company_user_user cuu LEFT JOIN fs_user f1 ON cuu.user_id =f1.user_id left JOIN fs_user f2 ON f1.tui_user_id =f2.user_id LEFT JOIN company_user cu ON cu.user_id = f1.bind_company_user_id"+
             " where f1.is_del=0 "+
             "            <if test=\"companyUserId != null \"> and cuu.company_user_id=#{companyUserId}</if>\n" +
             "            <if test=\"companyId != null \"> and cuu.company_id=#{companyId}</if>\n" +
+            "            <if test=\"bindCompanyUserId != null \"> and f1.bind_company_user_id=#{bindCompanyUserId}</if>\n" +
             "            <if test=\"nickName != null  and nickName != ''\"> and f1.nick_name like concat( #{nickName}, '%')</if>\n" +
             "            <if test=\"avatar != null  and avatar != ''\"> and f1.avatar = #{avatar}</if>\n" +
             "            <if test=\"phone != null  and phone != ''\"> and f1.phone like concat('%', #{phone}, '%')</if>\n" +

fs-service/src/main/java/com/fs/his/param/FsUserParam.java

@@ -73,6 +73,9 @@ public class FsUserParam {
 
     private Long companyId;
 
+    /** 直播归属销售ID */
+    private Long bindCompanyUserId;
+
     private Integer isBuy;
 
     private String loginDevice;//当前登录设备

fs-service/src/main/java/com/fs/his/vo/FsUserVO.java

@@ -18,6 +18,9 @@ public class FsUserVO extends FsUser implements Serializable
     @Excel(name = "所属销售", sort = 10)
     private String companyUserNickName;
 
+    @ApiModelProperty(value = "直播归属销售名称")
+    private String bindCompanyUserNickName;
+
     @ApiModelProperty(value = "所属公司")
     @Excel(name = "所属公司", sort = 9)
     private String companyName;