feat: 销售端添加判断重粉

fs-company/src/main/java/com/fs/users/controller/FsUserController.java

@@ -137,6 +137,12 @@ public class FsUserController extends BaseController
     @PostMapping("/enabledUsers")
     @ApiOperation("批量启用会员")
     public ResponseResult<Boolean> enabledUsers(@RequestBody String[] ids) {
+        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        Integer count = fsUserService.selectFsUserByUserIds(ids, loginUser.getUser().getUserId());
+        if(count > 0){
+            return ResponseResult.fail(400, "重粉会员不能移除小黑屋");
+        }
+
         Boolean r = fsUserService.disabledUser(ids, true);
         return ResponseResult.ok(r);
     }

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

@@ -1426,8 +1426,9 @@
 
     <select id ="selectFsUserByUserIds" resultType="Integer">
         select count(1) from fs_user_company_user
+        LEFT JOIN company_user ON company_user.user_id = fs_user_company_user.company_user_id
         where is_repeat_fans = 1
-        and fs_user_company_user.company_user_id = #{companyUserId}
+        and (fs_user_company_user.company_user_id = #{companyUserId} OR company_user.parent_id = #{companyUserId})
         <if test="userIds != null and userIds.length > 0 ">
             and fs_user_company_user.user_id in
             <foreach collection="userIds" open="(" close=")" separator="," item="userId">