feat: 用户认证状态查询条件

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

@@ -1432,9 +1432,6 @@ public class SysUserController {
 	 */
 	@GetMapping("/selectUserList")
 	public R selectUserList(Page page, UserDTO userDTO) {
-		if (!"0".equals(userDTO.getSubType()) && !"1".equals(userDTO.getSubType())) {
-			userDTO.setSubType(null);
-		}
 
 		IPage<UserVO> userVosPage = userService.selectUserList(page, userDTO);
 

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/SysUserServiceImpl.java

@@ -979,15 +979,11 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 					.eq(SysUserSub::getCertStatus, userDTO.getCertType()));
 			if (CollUtil.isNotEmpty(userSubList)) {
 				Set<Integer> certUserIdSet = userSubList.stream().map(SysUserSub::getUserId).collect(Collectors.toSet());
-				if (CollUtil.isNotEmpty(userDTO.getUserIdList())) {
-					// 如果已存在userIdList，则取交集
-					Set<Integer> distinctIdSet = CollUtil.intersectionDistinct(certUserIdSet, userDTO.getUserIdList());
-					userDTO.setUserIdList(CollUtil.newArrayList(distinctIdSet));
-				} else {
-					userDTO.setUserIdList(CollUtil.newArrayList(certUserIdSet));
-				}
-				userDTO.setCertStatus(null);
+				userDTO.setUserIdList(CollUtil.newArrayList(certUserIdSet));
+			} else {
+				userDTO.setUserIdList(CollUtil.newArrayList(-1));
 			}
+			userDTO.setCertStatus(null);
 		}
 
 		if (SecurityUtils.getRoles().contains(1) || SecurityUtils.getRoles().contains(2)) {