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

lin

2024-03-25 c02703a1aef70d2bb830c63652df72c98403db39

 src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java

@@ -52,8 +52,6 @@
import org.springblade.modules.house.service.IHouseholdService;
import org.springblade.modules.police.entity.PoliceAffairsGridEntity;
import org.springblade.modules.police.service.IPoliceAffairsGridService;
import org.springblade.modules.policeAlarmRecords.entity.PoliceAlarmRecordsEntity;
import org.springblade.modules.policeAlarmRecords.service.IPoliceAlarmRecordsService;
import org.springblade.modules.property.entity.PropertyCompanyEntity;
import org.springblade.modules.property.service.IPropertyCompanyService;
import org.springblade.modules.system.entity.*;
@@ -612,15 +610,31 @@
      }
   }

   /**
    * 通过小区id查询物业人员
    *
    * @param districtId
    * @param building
    * @return
    */
   @Override
   public List<UserEntity> getUserInfoByDistrictId(String districtId, String building) {
      return baseMapper.getUserInfoByDistrictId(districtId, building);
   }

   /**
    * 通过小区id查询用户
    *
    * @param districtIds
    * @param building
    * @param unit
    * @param name
    * @return
    */
   @Override
   public List<User> getUserInfoByDistrictIds(String districtIds) {
   public IPage<User> getUserInfoByDistrictIds(String districtIds, String building, String unit, String name, IPage<User> page) {
      List<String> list = JSON.parseArray(districtIds).toJavaList(String.class);
      return baseMapper.getUserInfoByDistrictIds(list);
      return page.setRecords(baseMapper.getUserInfoByDistrictIds(list, building, unit, name, page));
   }

   /**