Merge branch 'feat-20220718-oladinghenan' into temp-pre

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/SysUserController.java

@@ -81,6 +81,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.validation.Valid;
 import java.util.*;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * @author hnqz
@@ -1438,9 +1439,15 @@ public class SysUserController {
 	 */
 	@GetMapping("/selectUserList")
 	public R selectUserList(Page page, UserDTO userDTO) {
-		if (!"0".equals(userDTO.getSubType()) && !"1".equals(userDTO.getSubType())
-				&& !"2".equals(userDTO.getSubType()) && !"3".equals(userDTO.getSubType())) {
-			userDTO.setSubType(null);
+		if (StrUtil.isNotBlank(userDTO.getSubType())) {
+			String[] gigTypeArr = Stream.of(GigTypeEnum.values())
+					.map(GigTypeEnum::getCode)
+					.map(String::valueOf)
+					.toArray(String[]::new);
+			if (!ArrayUtil.containsAny(userDTO.getSubType().split(StrUtil.COMMA), gigTypeArr)) {
+				// 只接收已有的渠道类型值
+				userDTO.setSubType(null);
+			}
 		}
 
 		IPage<UserVO> userVosPage = userService.selectUserList(page, userDTO);