Merge remote-tracking branch 'origin/master'

lin

2024-03-25 9f8f9d13c42ca8cdccbf351069082a5fdccef2e4

 src/main/java/org/springblade/modules/system/service/IUserService.java

@@ -23,6 +23,7 @@
import org.springblade.core.mp.base.BaseService;
import org.springblade.core.mp.support.Query;
import org.springblade.modules.auth.enums.UserEnum;
import org.springblade.modules.house.vo.HouseholdVO;
import org.springblade.modules.system.entity.User;
import org.springblade.modules.system.entity.UserInfo;
import org.springblade.modules.system.entity.UserOauth;
@@ -268,5 +269,21 @@
    */
   void importPoliceUser(List<PoliceUserExcel> data);

   List<UserEntity> getUserInfoByDistrictIds(String districtIds);
   /**
    * 通过小区id查询用户
    * @param districtIds
    * @param building
    * @param unit
    * @param name
    * @return
    */
   IPage<HouseholdVO> getUserInfoByDistrictIds(String districtIds,String building,String unit,String name,IPage<HouseholdVO> page);

   /**
    * 查询500M内的民警
    * @param longitude
    * @param latitude
    * @return
    */
   List<User> getPoliceUser(String longitude, String latitude, String houseCode);
}