⚡ 系统用户相关的 service 和 mapper 层，修改使用 Collection 接收参数，方便使用

ballcat-system/ballcat-system-biz/src/main/java/com/hccake/ballcat/system/mapper/SysUserMapper.java

@@ -6,18 +6,19 @@ import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
-import com.hccake.ballcat.system.model.entity.SysUser;
-import com.hccake.ballcat.system.model.qo.SysUserQO;
-import com.hccake.ballcat.system.model.vo.SysUserPageVO;
 import com.hccake.ballcat.common.core.constant.GlobalConstants;
 import com.hccake.ballcat.common.model.domain.PageParam;
 import com.hccake.ballcat.common.model.domain.PageResult;
 import com.hccake.ballcat.common.model.domain.SelectData;
+import com.hccake.ballcat.system.model.entity.SysUser;
+import com.hccake.ballcat.system.model.qo.SysUserQO;
+import com.hccake.ballcat.system.model.vo.SysUserPageVO;
 import com.hccake.extend.mybatis.plus.conditions.query.LambdaAliasQueryWrapperX;
 import com.hccake.extend.mybatis.plus.mapper.ExtendMapper;
 import com.hccake.extend.mybatis.plus.toolkit.WrappersX;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.Collection;
 import java.util.List;
 
 /**
@@ -63,7 +64,7 @@ public interface SysUserMapper extends ExtendMapper<SysUser> {
 	 * @param status 状态
 	 * @return 是否更新成功
 	 */
-	default boolean updateUserStatusBatch(List<Integer> userIds, Integer status) {
+	default boolean updateUserStatusBatch(Collection<Integer> userIds, Integer status) {
 		int i = this.update(null,
 				Wrappers.lambdaUpdate(SysUser.class).set(SysUser::getStatus, status).in(SysUser::getUserId, userIds));
 		return SqlHelper.retBool(i);
@@ -95,7 +96,7 @@ public interface SysUserMapper extends ExtendMapper<SysUser> {
 	 * @param organizationIds 组织机构id集合
 	 * @return 用户集合
 	 */
-	default List<SysUser> listByOrganizationIds(List<Integer> organizationIds) {
+	default List<SysUser> listByOrganizationIds(Collection<Integer> organizationIds) {
 		return this.selectList(Wrappers.<SysUser>lambdaQuery().in(SysUser::getOrganizationId, organizationIds));
 	}
 
@@ -104,7 +105,7 @@ public interface SysUserMapper extends ExtendMapper<SysUser> {
 	 * @param userTypes 用户类型集合
 	 * @return 用户集合
 	 */
-	default List<SysUser> listByUserTypes(List<Integer> userTypes) {
+	default List<SysUser> listByUserTypes(Collection<Integer> userTypes) {
 		return this.selectList(Wrappers.<SysUser>lambdaQuery().in(SysUser::getType, userTypes));
 	}
 
@@ -113,7 +114,7 @@ public interface SysUserMapper extends ExtendMapper<SysUser> {
 	 * @param userIds 用户Id集合
 	 * @return 用户集合
 	 */
-	default List<SysUser> listByUserIds(List<Integer> userIds) {
+	default List<SysUser> listByUserIds(Collection<Integer> userIds) {
 		return this.selectList(Wrappers.<SysUser>lambdaQuery().in(SysUser::getUserId, userIds));
 	}
 
@@ -122,13 +123,13 @@ public interface SysUserMapper extends ExtendMapper<SysUser> {
 	 * @param roleCodes 角色标识
 	 * @return List<SysUser> 该角色标识对应的用户列表
 	 */
-	List<SysUser> listByRoleCodes(@Param("roleCodes") List<String> roleCodes);
+	List<SysUser> listByRoleCodes(@Param("roleCodes") Collection<String> roleCodes);
 
 	/**
 	 * 返回用户的select数据 name=> username value => userId
 	 * @param userTypes 用户类型
 	 * @return List<SelectData>
 	 */
-	List<SelectData<?>> listSelectData(@Param("userTypes") List<Integer> userTypes);
+	List<SelectData<?>> listSelectData(@Param("userTypes") Collection<Integer> userTypes);
 
 }

ballcat-system/ballcat-system-biz/src/main/java/com/hccake/ballcat/system/service/SysUserService.java

@@ -13,6 +13,7 @@ import com.hccake.extend.mybatis.plus.service.ExtendService;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
+import java.util.Collection;
 import java.util.List;
 
 /**
@@ -88,7 +89,7 @@ public interface SysUserService extends ExtendService<SysUser> {
 	 * @param status 状态
 	 * @return boolean
 	 */
-	boolean updateUserStatusBatch(List<Integer> userIds, Integer status);
+	boolean updateUserStatusBatch(Collection<Integer> userIds, Integer status);
 
 	/**
 	 * 修改系统用户头像
@@ -111,35 +112,35 @@ public interface SysUserService extends ExtendService<SysUser> {
 	 * @param roleCodes 角色标识集合
 	 * @return List<SysUser> 用户集合
 	 */
-	List<SysUser> listByRoleCodes(List<String> roleCodes);
+	List<SysUser> listByRoleCodes(Collection<String> roleCodes);
 
 	/**
 	 * 根据组织机构ID查询用户
 	 * @param organizationIds 组织机构id集合
 	 * @return 用户集合
 	 */
-	List<SysUser> listByOrganizationIds(List<Integer> organizationIds);
+	List<SysUser> listByOrganizationIds(Collection<Integer> organizationIds);
 
 	/**
 	 * 根据用户类型查询用户
 	 * @param userTypes 用户类型集合
 	 * @return 用户集合
 	 */
-	List<SysUser> listByUserTypes(List<Integer> userTypes);
+	List<SysUser> listByUserTypes(Collection<Integer> userTypes);
 
 	/**
 	 * 根据用户Id集合查询用户
 	 * @param userIds 用户Id集合
 	 * @return 用户集合
 	 */
-	List<SysUser> listByUserIds(List<Integer> userIds);
+	List<SysUser> listByUserIds(Collection<Integer> userIds);
 
 	/**
 	 * 返回用户的select数据
 	 * @param type 为空时返回所有客户为1返回系统客户 name=> username value => userId
 	 * @return List<SelectData>
 	 */
-	List<SelectData<?>> listSelectData(List<Integer> type);
+	List<SelectData<?>> listSelectData(Collection<Integer> type);
 
 	/**
 	 * 获取用户的角色Code集合

ballcat-system/ballcat-system-biz/src/main/java/com/hccake/ballcat/system/service/impl/SysUserServiceImpl.java

@@ -225,7 +225,7 @@ public class SysUserServiceImpl extends ExtendServiceImpl<SysUserMapper, SysUser
 	 * @return 更新成功：true
 	 */
 	@Override
-	public boolean updateUserStatusBatch(List<Integer> userIds, Integer status) {
+	public boolean updateUserStatusBatch(Collection<Integer> userIds, Integer status) {
 
 		List<SysUser> userList = baseMapper.listByUserIds(userIds);
 		Assert.notEmpty(userList, "更新用户状态失败，待更新用户列表为空");
@@ -272,7 +272,7 @@ public class SysUserServiceImpl extends ExtendServiceImpl<SysUserMapper, SysUser
 	 * @return List<SysUser>
 	 */
 	@Override
-	public List<SysUser> listByRoleCodes(List<String> roleCodes) {
+	public List<SysUser> listByRoleCodes(Collection<String> roleCodes) {
 		return baseMapper.listByRoleCodes(roleCodes);
 	}
 
@@ -282,7 +282,7 @@ public class SysUserServiceImpl extends ExtendServiceImpl<SysUserMapper, SysUser
 	 * @return 用户集合
 	 */
 	@Override
-	public List<SysUser> listByOrganizationIds(List<Integer> organizationIds) {
+	public List<SysUser> listByOrganizationIds(Collection<Integer> organizationIds) {
 		return baseMapper.listByOrganizationIds(organizationIds);
 	}
 
@@ -292,7 +292,7 @@ public class SysUserServiceImpl extends ExtendServiceImpl<SysUserMapper, SysUser
 	 * @return 用户集合
 	 */
 	@Override
-	public List<SysUser> listByUserTypes(List<Integer> userTypes) {
+	public List<SysUser> listByUserTypes(Collection<Integer> userTypes) {
 		return baseMapper.listByUserTypes(userTypes);
 	}
 
@@ -302,7 +302,7 @@ public class SysUserServiceImpl extends ExtendServiceImpl<SysUserMapper, SysUser
 	 * @return 用户集合
 	 */
 	@Override
-	public List<SysUser> listByUserIds(List<Integer> userIds) {
+	public List<SysUser> listByUserIds(Collection<Integer> userIds) {
 		return baseMapper.listByUserIds(userIds);
 
 	}
@@ -313,7 +313,7 @@ public class SysUserServiceImpl extends ExtendServiceImpl<SysUserMapper, SysUser
 	 * @param userTypes 用户类型
 	 */
 	@Override
-	public List<SelectData<?>> listSelectData(List<Integer> userTypes) {
+	public List<SelectData<?>> listSelectData(Collection<Integer> userTypes) {
 		return baseMapper.listSelectData(userTypes);
 	}