Commit 1c73a205 authored by xiaoguang.xu's avatar xiaoguang.xu

feat: 增加对姓名的过滤

parent 70f41f4d
......@@ -632,7 +632,8 @@ public class InnerController implements IBaseController {
@RequestMapping("/user_detail/fuzzyQuery")
@TargetDataSource(type = DSType.SLAVE)
public JsonResult<List<UserDetail>> fuzzyQueryUserDetailList(@ApiParam(value = "手机号", required = true) @RequestParam(name = "phoneNo") String phoneNo,
@ApiParam(value = "身份证号", required = true) @RequestParam(name = "idNo") String idNo) {
@ApiParam(value = "身份证号", required = true) @RequestParam(name = "idNo") String idNo,
@ApiParam(value = "用户姓名") @RequestParam(name = "userName", required = false) String userName) {
log.info("fuzzyQueryUserDetailList, phone:{},idNo:{},ip:{}", phoneNo, idNo, getIp());
if (StringUtils.isBlank(phoneNo) || StringUtils.isBlank(idNo)) {
return JsonResult.buildErrorStateResult("查询条件不能为空", null);
......@@ -646,6 +647,9 @@ public class InnerController implements IBaseController {
boolean idNoValid = idNo.length() >= idNoMaskSize || Objects.equals(idNo.length(), idNoFullSize);
if (phoneNoValid && idNoValid) {
List<UserDetail> userDetailList = userDetailService.fuzzyQueryByPhoneNoAndIdNo(phoneNo, idNo);
if (StringUtils.isNotEmpty(userName)) {
userDetailList = userDetailList.stream().filter(userDetail -> userDetail.getName().equals(userName)).collect(Collectors.toList());
}
return JsonResult.buildSuccessResult("success", userDetailList);
}
return JsonResult.buildErrorStateResult("查询条件不规范!", null);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment