feat：批量取消禁用调整

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

@@ -119,7 +119,8 @@ public class FsUserController extends AppBaseController {
     @ApiOperation("批量启用会员")
     public ResponseResult<Boolean> enabledUser(@ApiParam(value = "联系人id集合", required = true) @RequestBody String[] ids) {
         // 如果存在重粉的数据，则禁止启用，需要提示
-        Integer count = fsUserService.selectFsUserByUserIds(ids);
+        long companyUserId = Long.parseLong(getUserId());
+        Integer count = fsUserService.selectFsUserByUserIds(ids, companyUserId);
         if(count > 0){
             return ResponseResult.fail(400, "重粉会员不能移除小黑屋");
         }

fs-service-system/src/main/java/com/fs/store/mapper/FsUserMapper.java

@@ -295,5 +295,5 @@ public interface FsUserMapper
      * @param userIds 会员ids
      * @return
      */
-    Integer selectFsUserByUserIds(@Param("userIds") String[] userIds);
+    Integer selectFsUserByUserIds(@Param("userIds") String[] userIds, @Param("companyUserId") Long companyUserId);
 }

fs-service-system/src/main/java/com/fs/store/service/IFsUserService.java

@@ -151,7 +151,7 @@ public interface IFsUserService
      * @param userIds
      * @return
      */
-    Integer selectFsUserByUserIds(@Param("userIds") String[] userIds);
+    Integer selectFsUserByUserIds(String[] userIds, Long companyUserId);
 
     Boolean disabledUser(String[] ids, boolean status);
 

fs-service-system/src/main/java/com/fs/store/service/impl/FsUserServiceImpl.java

@@ -587,8 +587,8 @@ public class FsUserServiceImpl implements IFsUserService
     }
 
     @Override
-    public Integer selectFsUserByUserIds(String[] userIds) {
-        return fsUserMapper.selectFsUserByUserIds(userIds);
+    public Integer selectFsUserByUserIds(String[] userIds, Long companyUserId) {
+        return fsUserMapper.selectFsUserByUserIds(userIds, companyUserId);
     }
 
     @Override

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

@@ -1325,6 +1325,7 @@
     <select id ="selectFsUserByUserIds" resultType="Integer">
         select count(1) from fs_user_company_user
         where is_repeat_fans = 1
+        and fs_user_company_user.company_user_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">