|
@@ -20,6 +20,7 @@
|
|
|
package com.qunzhixinxi.hnqz.admin.controller;
|
|
|
|
|
|
import cn.hutool.core.collection.CollUtil;
|
|
|
+import cn.hutool.core.util.ArrayUtil;
|
|
|
import cn.hutool.core.util.IdcardUtil;
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
|
import cn.hutool.core.bean.BeanUtil;
|
|
@@ -80,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
|
|
@@ -1432,9 +1434,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);
|