Merge remote-tracking branch 'origin/master'

zhongrj

2024-03-11 7f3ee212eb210aba3a7da7d2cb4a8d1af2f56116

 src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java

@@ -23,6 +23,7 @@
import org.apache.logging.log4j.util.Strings;
import org.springblade.common.constant.DictConstant;
import org.springblade.common.node.TreeStringNode;
import org.springblade.common.param.CommonParamSet;
import org.springblade.common.utils.ComplexNumberStringComparator;
import org.springblade.common.utils.NodeTreeUtil;
import org.springblade.core.secure.utils.AuthUtil;
@@ -699,7 +700,7 @@
      if (null != houseParam.getRoleName() && !houseParam.getRoleName().equals("")) {
         if (houseParam.getRoleName().equals("民警") && !userId.equals("1726859808689696770")) {
            // 查询对应的房屋地址code
            stringList = communityService.getCommunityCodeListByUserId(AuthUtil.getUserId());
            stringList = policeAffairsGridService.getCommunityCodeListByUserId(AuthUtil.getUserId());
         }
      }
      return stringList;
@@ -940,12 +941,29 @@

   /**
    * 查询场所标准地址数据
    * @param doorplateAddressVO
    * @param doorplateAddress
    * @param size
    * @return
    */
   @Override
   public Object getPlaceList(DoorplateAddressVO doorplateAddressVO, Integer size) {
      return baseMapper.getPlaceList(doorplateAddressVO,size);
   public Object getPlaceList(DoorplateAddressVO doorplateAddress, Integer size) {
      // 公共参数设置
      CommonParamSet commonParamSet = new CommonParamSet().invoke(DoorplateAddressVO.class,doorplateAddress);
      return baseMapper.getPlaceList(doorplateAddress,
         null==size?10:size,
         commonParamSet.getGridCodeList(),
         commonParamSet.getRegionChildCodesList(),
         commonParamSet.getIsAdministrator()
         );
   }

   /**
    * 通过小区id 查询楼栋编码
    * @param districtId
    * @return
    */
   @Override
   public    List<DoorplateAddressVO>  getHouseBuildingCode(String districtId) {
      return baseMapper.getHouseBuildingCode(districtId);
   }
}