小区用户支持栋，单元+名字查询

lin

2024-03-25 c02703a1aef70d2bb830c63652df72c98403db39

 src/main/java/org/springblade/modules/system/controller/UserController.java

@@ -382,10 +382,11 @@

   /**
    * 获取用户信息
    *
    * @return
    */
   @GetMapping("/getUserInfo")
   public R getUserInfo(){
   public R getUserInfo() {
      //根据保安员编码查询保安员信息
      return R.data(userService.getUserInfo(AuthUtil.getUserId()));
   }
@@ -410,12 +411,17 @@
   }

   /**
    * 通过小区id查询物业人员/网格人员
    * 通过小区id查询用户
    */
   @GetMapping("/getUserInfoByDistrictIds")
   @ApiOperation(value = "查询物业人员By小区id", notes = "houseCode")
   public R getUserInfoByDistrictIds(@RequestParam("districtIds") String districtIds) {
      return R.data(userService.getUserInfoByDistrictIds(districtIds));
   @ApiOperation(value = "通过小区id查询用户")
   public  R<IPage<UserVO>> getUserInfoByDistrictIds(@RequestParam("districtIds") String districtIds
      , @RequestParam(value = "building", required = false) String building
      , @RequestParam(value = "unit", required = false) String unit
      , @RequestParam(value = "name", required = false) String name
      , Query query) {
      IPage<User> pages = userService.getUserInfoByDistrictIds(districtIds, building, unit, name, Condition.getPage(query));
      return R.data(UserWrapper.build().pageVO(pages));
   }


@@ -424,8 +430,8 @@
    */
   @GetMapping("/getUserInfoByPropertyCompanyId")
   @ApiOperation(value = "通过机构查询物业公司人员", notes = "propertyCompanyId")
   public R getUserInfoByPropertyId(@RequestParam("propertyCompanyId") String propertyCompanyId,@RequestParam("roleId") String roleId) {
      return R.data(userService.getUserInfoByPropertyId(propertyCompanyId,roleId));
   public R getUserInfoByPropertyId(@RequestParam("propertyCompanyId") String propertyCompanyId, @RequestParam("roleId") String roleId) {
      return R.data(userService.getUserInfoByPropertyId(propertyCompanyId, roleId));
   }

   /**
@@ -462,8 +468,8 @@
    */
   @GetMapping("/getPoliceUser")
   @ApiOperation(value = "通过经纬度查询最近的民警人员")
   public R getPoliceUser(@RequestParam("longitude") String longitude, @RequestParam(value = "latitude") String latitude,@RequestParam(value = "houseCode",required = false) String houseCode) {
      return R.data(userService.getPoliceUser(longitude, latitude,houseCode));
   public R getPoliceUser(@RequestParam("longitude") String longitude, @RequestParam(value = "latitude") String latitude, @RequestParam(value = "houseCode", required = false) String houseCode) {
      return R.data(userService.getPoliceUser(longitude, latitude, houseCode));
   }

}