From cb6efdef55c77da2bcc8dbd99a74e7e49c5ec067 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Tue, 05 Mar 2024 18:06:34 +0800
Subject: [PATCH] 邮件收件+bug修复+流程优化

---
 src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java |   16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java b/src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java
index e9f9044..f8ef660 100644
--- a/src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java
+++ b/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,19 @@
 
 	/**
 	 * 查询场所标准地址数据
-	 * @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()
+			);
 	}
 }

--
Gitblit v1.9.3