From 348b2464bb5e500cb92c4e2d2819ed7ceb74c831 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Mon, 11 Mar 2024 15:40:44 +0800
Subject: [PATCH] 场所详细查询返回绑定多个房屋的二维码编号和标准地址修改

---
 src/main/java/org/springblade/modules/article/service/impl/ArticleServiceImpl.java |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/article/service/impl/ArticleServiceImpl.java b/src/main/java/org/springblade/modules/article/service/impl/ArticleServiceImpl.java
index b3ceaa5..369ee7f 100644
--- a/src/main/java/org/springblade/modules/article/service/impl/ArticleServiceImpl.java
+++ b/src/main/java/org/springblade/modules/article/service/impl/ArticleServiceImpl.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springblade.common.cache.SysCache;
+import org.springblade.common.utils.RoleUtil;
 import org.springblade.common.utils.SpringUtils;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.utils.SpringUtil;
@@ -50,7 +51,7 @@
 		// 	List<String> collect = list.stream().map(PropertyCompanyDistrictEntity::getDistrictId).collect(Collectors.toList());
 		// 	article.setDistrictIdList(collect);
 		// }
-		if (userRole.contains("wygly") || userRole.contains("wyxmjl")) {
+		if (RoleUtil.isProperty(userRole)) {
 			// 查询小区id
 			IPropertyDistrictUserService propertyDistrictUserService = SpringUtils.getBean(IPropertyDistrictUserService.class);
 			List<String> districtIds = propertyDistrictUserService.selectPropertyDistrictByUserId(AuthUtil.getUserId());
@@ -170,4 +171,12 @@
 		ArticleVO articleVO = baseMapper.getArticleOne(article);
 		return articleVO;
 	}
+
+	@Override
+	public List<ArticleVO> getArticleByDistrictId(ArticleVO article) {
+		List<String> objects = new ArrayList<>();
+		objects.add(article.getDistrictId());
+		article.setDistrictIdList(objects);
+		return baseMapper.getArticleByDistrictId(article);
+	}
 }

--
Gitblit v1.9.3