1、公司配置是否开启小黑屋；2、会员移除小黑屋；

fs-company/src/main/java/com/fs/company/controller/CompanyController.java

@@ -15,6 +15,7 @@ import com.fs.company.vo.CompanyNameVO;
 import com.fs.core.security.LoginUser;
 import com.fs.core.web.service.TokenService;
 import com.fs.his.vo.OptionsVO;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -106,4 +107,12 @@ public class CompanyController extends BaseController
         return getDataTable(list);
     }
 
+    @ApiOperation("配置销售审核")
+    @PostMapping(value = "/configUserCheck")
+    public R configUserCheck(boolean userIsDefaultBlack) {
+        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        companyService.configUserCheck(loginUser.getCompany().getCompanyId(), userIsDefaultBlack ? 1 : 0);
+        return R.ok();
+    }
+
 }

fs-company/src/main/java/com/fs/user/FsUserAdminController.java

@@ -2,6 +2,8 @@ package com.fs.user;
 
 import com.fs.common.constant.HttpStatus;
 import com.fs.common.core.controller.BaseController;
+import com.fs.common.core.domain.R;
+import com.fs.common.core.domain.ResponseResult;
 import com.fs.common.core.page.TableDataInfo;
 import com.fs.common.utils.ServletUtils;
 import com.fs.core.security.LoginUser;
@@ -39,6 +41,7 @@ public class FsUserAdminController extends BaseController {
     public TableDataInfo pageList(@RequestBody FsUserPageListParam param) {
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
         param.setCompanyId(loginUser.getCompany().getCompanyId());
+        param.setPcLoginUserId(loginUser.getUser().getUserId());
 
         List<FsUserPageListVO> list = fsUserService.selectFsUserPageListNew(param);
         Long total = fsUserService.selectFsUserCount(param);
@@ -50,5 +53,15 @@ public class FsUserAdminController extends BaseController {
         return rspData;
     }
 
+    @PostMapping("/auditUser")
+    @ApiOperation("审核用户（移除小黑屋）")
+    public R auditUser(@RequestBody String[] userIds) {
+        Boolean r = fsUserService.disabledUser(userIds, true);
+        if (r) {
+            return R.ok();
+        }
+        return R.error();
+    }
+
 
 }

fs-service-system/src/main/java/com/fs/company/domain/Company.java

@@ -86,6 +86,9 @@ public class Company extends BaseEntity
 
     private BigDecimal redPackageMoney;
 
+    /** 会员是否默认黑名单，1-是；0-否（用于销售分享成为会员的操作） */
+    private Integer fsUserIsDefaultBlack;
+
     public String getOmsCode() {
         return omsCode;
     }
@@ -290,4 +293,12 @@ public class Company extends BaseEntity
     public void setRedPackageMoney(BigDecimal redPackageMoney) {
         this.redPackageMoney = redPackageMoney;
     }
+
+    public Integer getFsUserIsDefaultBlack() {
+        return fsUserIsDefaultBlack;
+    }
+
+    public void setFsUserIsDefaultBlack(Integer fsUserIsDefaultBlack) {
+        this.fsUserIsDefaultBlack = fsUserIsDefaultBlack;
+    }
 }

fs-service-system/src/main/java/com/fs/company/domain/CompanyUser.java

@@ -130,9 +130,6 @@ public class CompanyUser extends BaseEntity
     /** 是否审核 */
     private Integer isAudit;
 
-    /** 会员是否默认黑名单，1-是；0-否（用于销售分享成为会员的操作） */
-    private Integer fsUserIsDefaultBlack;
-
     public Integer getIsAudit() {
         return isAudit;
     }
@@ -451,10 +448,6 @@ public class CompanyUser extends BaseEntity
         return isDel;
     }
 
-    public Integer getFsUserIsDefaultBlack() {
-        return fsUserIsDefaultBlack;
-    }
-
     public void setStatusText(String statusText) {
         this.statusText = statusText;
     }

fs-service-system/src/main/java/com/fs/company/service/ICompanyService.java

@@ -105,4 +105,6 @@ public interface ICompanyService
     Company selectCompanyByIdForUpdate(Long companyId);
 
     void updateMoney(Long companyId, BigDecimal money);
+
+    void configUserCheck(Long companyId, Integer userIsDefaultBlack);
 }

fs-service-system/src/main/java/com/fs/company/service/impl/CompanyServiceImpl.java

@@ -438,4 +438,13 @@ public class CompanyServiceImpl implements ICompanyService
         Company company = selectCompanyById(companyId);
         companyMapper.updateMoney(companyId, company.getRedPackageMoney().add(money));
     }
+
+    @Override
+    public void configUserCheck(Long companyId, Integer userIsDefaultBlack) {
+        Company company = companyMapper.selectCompanyById(companyId);
+        if(company != null) {
+            company.setFsUserIsDefaultBlack(userIsDefaultBlack);
+            companyMapper.updateCompany(company);
+        }
+    }
 }

fs-service-system/src/main/java/com/fs/store/param/h5/FsUserPageListParam.java

@@ -63,6 +63,11 @@ public class FsUserPageListParam implements Serializable {
      */
     private Long companyId;
 
+    /**
+     * 销售端登录用户id（该字段用于区分之前的登录用户）
+     */
+    private Long pcLoginUserId;
+
 
 }
 

fs-service-system/src/main/java/com/fs/store/vo/h5/FsUserPageListVO.java

@@ -77,4 +77,7 @@ public class FsUserPageListVO {
     @ApiModelProperty(value = "备注")
     private String remark;
 
+    @ApiModelProperty(value = "是否属于当前销售")
+    private int isCurrentCompanyUser;
+
 }

fs-service-system/src/main/resources/mapper/company/CompanyMapper.xml

@@ -125,6 +125,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isDel != null">is_del = #{isDel},</if>
             <if test="voiceCallerNumber != null">voice_caller_number = #{voiceCallerNumber},</if>
             <if test="omsCode != null ">oms_code = #{omsCode},</if>
+            <if test="fsUserIsDefaultBlack != null ">fs_user_is_default_black = #{fsUserIsDefaultBlack},</if>
         </trim>
         where company_id = #{companyId}
     </update>

fs-service-system/src/main/resources/mapper/store/FsUserMapper.xml

@@ -391,7 +391,8 @@
         fs_user_course_count.complete_watch_date,
         GROUP_CONCAT(DISTINCT company_tag.tag) AS tag,
         GROUP_CONCAT(DISTINCT company_tag.tag_id) AS tagIds,
-        company_user.nick_name as companyUserNickName
+        company_user.nick_name as companyUserNickName,
+        if(fs_user.company_user_id = #{pcLoginUserId} or company_user.parent_id = #{pcLoginUserId}, 1, 0) as isCurrentCompanyUser
         FROM
         (SELECT
         fu.user_id
@@ -407,14 +408,14 @@
             <if test="companyUserId != null and companyUserId !='' ">
                 AND cu.user_id = #{companyUserId}
             </if>
-            <choose>
-                <when test = "isBlack">
-                    AND fu.status = 0
-                </when>
-                <otherwise>
-                    AND fu.status = 1
-                </otherwise>
-            </choose>
+<!--            <choose>-->
+<!--                <when test = "isBlack">-->
+<!--                    AND fu.status = 0-->
+<!--                </when>-->
+<!--                <otherwise>-->
+<!--                    AND fu.status = 1-->
+<!--                </otherwise>-->
+<!--            </choose>-->
             <if test="keyword != null and keyword !='' ">
                 AND (fu.nickname LIKE concat('%',#{keyword},'%')
                 OR fu.phone LIKE concat('%',#{keyword},'%')