|
@@ -432,6 +432,7 @@ public class PersonInfoController {
|
|
@ApiImplicitParam(name = "phone",value = "手机号", required = false, paramType = "form",dataType = "String"),
|
|
@ApiImplicitParam(name = "phone",value = "手机号", required = false, paramType = "form",dataType = "String"),
|
|
@ApiImplicitParam(name = "companyCode",value = "企业编码", required = false, paramType = "form",dataType = "String"),
|
|
@ApiImplicitParam(name = "companyCode",value = "企业编码", required = false, paramType = "form",dataType = "String"),
|
|
@ApiImplicitParam(name = "subordinate",value = "会否保护下级单位", required = false, paramType = "form",dataType = "String"),
|
|
@ApiImplicitParam(name = "subordinate",value = "会否保护下级单位", required = false, paramType = "form",dataType = "String"),
|
|
|
|
+ @ApiImplicitParam(name = "derviceName",value = "设备名称", required = false, paramType = "form",dataType = "String"),
|
|
@ApiImplicitParam(name = "position1",value = "一级位置", required = false, paramType = "form",dataType = "String"),
|
|
@ApiImplicitParam(name = "position1",value = "一级位置", required = false, paramType = "form",dataType = "String"),
|
|
@ApiImplicitParam(name = "position2",value = "二级位置", required = false, paramType = "form",dataType = "String"),
|
|
@ApiImplicitParam(name = "position2",value = "二级位置", required = false, paramType = "form",dataType = "String"),
|
|
@ApiImplicitParam(name = "position3",value = "三级位置", required = false, paramType = "form",dataType = "String"),
|
|
@ApiImplicitParam(name = "position3",value = "三级位置", required = false, paramType = "form",dataType = "String"),
|
|
@@ -446,6 +447,7 @@ public class PersonInfoController {
|
|
@RequestParam(value="phone",defaultValue="") String phone,
|
|
@RequestParam(value="phone",defaultValue="") String phone,
|
|
@RequestParam(value="companyCode",defaultValue="") String companyCode,
|
|
@RequestParam(value="companyCode",defaultValue="") String companyCode,
|
|
@RequestParam(value="subordinate",defaultValue="false") Boolean subordinate,
|
|
@RequestParam(value="subordinate",defaultValue="false") Boolean subordinate,
|
|
|
|
+ @RequestParam(value="derviceName",defaultValue="") String derviceName,
|
|
@RequestParam(value="position1",defaultValue="") String position1,
|
|
@RequestParam(value="position1",defaultValue="") String position1,
|
|
@RequestParam(value="position2",defaultValue="") String position2,
|
|
@RequestParam(value="position2",defaultValue="") String position2,
|
|
@RequestParam(value="position3",defaultValue="") String position3,
|
|
@RequestParam(value="position3",defaultValue="") String position3,
|
|
@@ -524,6 +526,15 @@ public class PersonInfoController {
|
|
searchParams.put("isUploadPhoto", isUploadPhoto);
|
|
searchParams.put("isUploadPhoto", isUploadPhoto);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ if(StringUtils.isNotEmpty(derviceName)){
|
|
|
|
+ List<Long> personDeviceRelation = personDeviceRelationService.findByDerviceName("%" + derviceName + "%");
|
|
|
|
+ //String relationPersonIds = String.join(",",personDeviceRelation);
|
|
|
|
+ searchParams.put("relationPersonIds", personDeviceRelation);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+
|
|
Page<PersonInfo> page = personInfoService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
|
|
Page<PersonInfo> page = personInfoService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
|
|
Page<PersonInfoDTO> pageDTO = PojoUtils.convertPage(page, PersonInfoDTO.class);
|
|
Page<PersonInfoDTO> pageDTO = PojoUtils.convertPage(page, PersonInfoDTO.class);
|
|
|
|
|