From 47712cc6cd4d52fcd1dde44e2a400ccbb9c6ae7a Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Fri, 12 Apr 2024 15:20:49 +0800
Subject: [PATCH] 民警网格区域查询合并,网格员区域树查询修改,解决不显示网格问题

---
 src/main/java/org/springblade/modules/article/service/impl/ArticleServiceImpl.java |   20 +++++++++++++++++++-
 1 files changed, 19 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 89c5139..91c6b67 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
@@ -85,7 +85,7 @@
 		}
 		if (userRole.contains("jdgly")) {
 			IDistrictService districtService = SpringUtils.getBean(IDistrictService.class);
-			List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
+			List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId(),null);
 			List<DistrictEntity> list = districtService.list(Wrappers.<DistrictEntity>lambdaQuery().in(DistrictEntity::getCommunityCode, regionChildCodesList));
 			if (list.size() > 0) {
 				article.setDistrictIdList(list.stream().map(item -> item.getId()).collect(Collectors.toList()));
@@ -226,4 +226,22 @@
 		// 返回
 		return update;
 	}
+
+	/**
+	 * 查询所有文章数据
+	 * @return
+	 */
+	@Override
+	public List<Article> getAllList(int i,int size) {
+		return baseMapper.getAllList(i,size);
+	}
+
+	/**
+	 * 查询所有文章数据总数
+	 * @return
+	 */
+	@Override
+	public int getAllListTotal() {
+		return baseMapper.getAllListTotal();
+	}
 }

--
Gitblit v1.9.3