⚡ sysUser select 支持根据多个 userType 进行筛选

ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/SysUserController.java

@@ -69,18 +69,9 @@ public class SysUserController {
 	 */
 	@GetMapping("/select")
 	@PreAuthorize("@per.hasPermission('sys:sysuser:read')")
-	public R<List<SelectData<?>>> getSelectData() {
-		return R.ok(sysUserService.getSelectData(null));
-	}
-
-	/**
-	 * 获取用户Select
-	 * @return 用户SelectData
-	 */
-	@GetMapping("/select/{userType}")
-	@PreAuthorize("@per.hasPermission('sys:sysuser:read')")
-	public R<List<SelectData<?>>> getSysSelectData(@PathVariable Integer userType) {
-		return R.ok(sysUserService.getSelectData(userType));
+	public R<List<SelectData<?>>> getSelectData(
+			@RequestParam(value = "userTypes", required = false) List<Integer> userTypes) {
+		return R.ok(sysUserService.getSelectData(userTypes));
 	}
 
 	/**

ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/mapper/SysUserMapper.java

@@ -35,9 +35,9 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
 
 	/**
 	 * 返回用户的select数据 name=> username value => userId
-	 * @param type 用户类型
+	 * @param userTypes 用户类型
 	 * @return List<SelectData>
 	 */
-	List<SelectData<?>> getSelectData(@Param("type") Integer type);
+	List<SelectData<?>> getSelectData(@Param("userTypes") List<Integer> userTypes);
 
 }

ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/SysUserService.java

@@ -110,6 +110,6 @@ public interface SysUserService extends IService<SysUser> {
 	 * @param type 为空时返回所有客户为1返回系统客户 name=> username value => userId
 	 * @return List<SelectData>
 	 */
-	List<SelectData<?>> getSelectData(Integer type);
+	List<SelectData<?>> getSelectData(List<Integer> type);
 
 }

ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysUserServiceImpl.java

@@ -280,10 +280,11 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 	/**
 	 * 返回用户的select数据 name=> username value => userId
 	 * @return List<SelectData>
+	 * @param userTypes 用户类型
 	 */
 	@Override
-	public List<SelectData<?>> getSelectData(Integer type) {
-		return baseMapper.getSelectData(type);
+	public List<SelectData<?>> getSelectData(List<Integer> userTypes) {
+		return baseMapper.getSelectData(userTypes);
 	}
 
 }

ballcat-admin/ballcat-admin-core/src/main/resources/mapper/sys/SysUserMapper.xml

@@ -51,8 +51,11 @@
 		sys_user
 		where
 		deleted = 0
-		<if test="type != null and type != ''">
-			and type = #{type}
+		<if test="userTypes != null and userTypes.size() > 0">
+			and type in
+			<foreach collection="userTypes" open="(" separator="," close=")" item="type">
+				#{type}
+			</foreach>
 		</if>
 	</select>