From bdfb1bfaf5dc5d7318c632fcc6fdf3ffacbd075f Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Mon, 15 Apr 2024 17:21:29 +0800
Subject: [PATCH] 社区管理员查询轮播图+报事报修查询优化
---
src/main/java/org/springblade/modules/article/service/impl/ArticleServiceImpl.java | 33 +++++++++++++++++++++++++++------
1 files changed, 27 insertions(+), 6 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 e8f5f7c..d1ffbbd 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
@@ -83,9 +83,9 @@
}
article.setPropertyFlag(1);
}
- if (userRole.contains("jdgly")) {
+ if (userRole.contains("jdgly") || userRole.contains("sqgly")) {
IDistrictService districtService = SpringUtils.getBean(IDistrictService.class);
- List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId(),null);
+ 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()));
@@ -110,8 +110,8 @@
IHouseholdService householdService = SpringUtils.getBean(IHouseholdService.class);
HouseholdEntity householdEntity = householdService.getOne(Wrappers.<HouseholdEntity>lambdaQuery()
.eq(HouseholdEntity::getHouseCode, article.getHouseCode())
- .eq(HouseholdEntity::getAssociatedUserId,AuthUtil.getUserId())
- .eq(HouseholdEntity::getIsDeleted,0)
+ .eq(HouseholdEntity::getAssociatedUserId, AuthUtil.getUserId())
+ .eq(HouseholdEntity::getIsDeleted, 0)
.last("limit 1"));
if (householdEntity != null) {
article.setHouseholdId(householdEntity.getId());
@@ -201,6 +201,7 @@
/**
* 文章信息更新
+ *
* @param objectUpdateWrapper
* @param id
* @param houseCode
@@ -209,11 +210,11 @@
@Override
public boolean updateArticle(UpdateWrapper<Article> objectUpdateWrapper, Long id, String houseCode) {
boolean update = update(null, objectUpdateWrapper);
- if (update){
+ if (update) {
// 查询对应的文章
Article article = getById(id);
// 只有反诈的有浏览积分
- if (article.getType()==6) {
+ if (article.getType() == 6) {
// 添加浏览记录信息
ArticleIntegralEntity integralEntity = new ArticleIntegralEntity();
integralEntity.setScore(article.getScore());
@@ -226,4 +227,24 @@
// 返回
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