From a5fac95408a43ad43de9d88c30d06c0918c7bc8f Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Wed, 29 May 2024 11:14:44 +0800
Subject: [PATCH] 配置调整
---
src/main/java/org/springblade/modules/article/service/impl/ArticleServiceImpl.java | 76 -------------------------------------
1 files changed, 1 insertions(+), 75 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 b40e43e..9583a5c 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
@@ -16,15 +16,6 @@
import org.springblade.modules.article.service.ArticleService;
import org.springblade.modules.article.service.IArticleIntegralService;
import org.springblade.modules.article.vo.ArticleVO;
-import org.springblade.modules.district.entity.DistrictEntity;
-import org.springblade.modules.district.service.IDistrictService;
-import org.springblade.modules.house.entity.HouseholdEntity;
-import org.springblade.modules.house.service.IHouseholdService;
-import org.springblade.modules.property.entity.PropertyCompanyDistrictEntity;
-import org.springblade.modules.property.entity.PropertyCompanyEntity;
-import org.springblade.modules.property.service.IPropertyCompanyDistrictService;
-import org.springblade.modules.property.service.IPropertyCompanyService;
-import org.springblade.modules.property.service.IPropertyDistrictUserService;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
@@ -51,47 +42,6 @@
@Override
public IPage<Article> selectArticlePage(IPage<Article> page, ArticleVO article) {
String userRole = AuthUtil.getUserRole();
- // 物业身份，只查询该物业公司下的公告
- // if (userRole.contains("wygly") || userRole.contains("wyxmjl")) {
- // // 物业公司 有哪些小区
- // IPropertyCompanyDistrictService bean = SpringUtils.getBean(IPropertyCompanyDistrictService.class);
- // List<PropertyCompanyDistrictEntity> list = bean.list(Wrappers.<PropertyCompanyDistrictEntity>lambdaQuery()
- // .eq(PropertyCompanyDistrictEntity::getUserId, AuthUtil.getUserId()));
- // List<String> collect = list.stream().map(PropertyCompanyDistrictEntity::getDistrictId).collect(Collectors.toList());
- // article.setDistrictIdList(collect);
- // }
- if (RoleUtil.isProperty(userRole)) {
- // 查询小区id
- IPropertyDistrictUserService propertyDistrictUserService = SpringUtils.getBean(IPropertyDistrictUserService.class);
- List<String> districtIds = propertyDistrictUserService.selectPropertyDistrictByUserId(AuthUtil.getUserId());
- // 通过用户机构查询用户的物业公司
- IPropertyCompanyService bean = SpringUtil.getBean(IPropertyCompanyService.class);
- PropertyCompanyEntity companyEntity = bean.getOne(Wrappers.<PropertyCompanyEntity>lambdaQuery()
- .eq(PropertyCompanyEntity::getDeptId, AuthUtil.getDeptId()).last("limit 1"));
- if (companyEntity != null) {
- IPropertyCompanyDistrictService bean2 = SpringUtils.getBean(IPropertyCompanyDistrictService.class);
- // 通过物业公司，查询小区
- List<PropertyCompanyDistrictEntity> propertyCompanyDistrictEntityList = bean2.list(Wrappers.<PropertyCompanyDistrictEntity>lambdaQuery()
- .eq(PropertyCompanyDistrictEntity::getPropertyCompanyId, companyEntity.getId()));
- if (propertyCompanyDistrictEntityList.size() > 0) {
- List<String> collect = propertyCompanyDistrictEntityList.stream().map(i -> i.getDistrictId()).collect(Collectors.toList());
- districtIds.addAll(collect);
- }
- }
- article.setDistrictIdList(districtIds);
- if (districtIds.size() == 0) {
- return page.setRecords(new ArrayList<>());
- }
- article.setPropertyFlag(1);
- }
- if (userRole.contains("jdgly") || userRole.contains("sqgly")) {
- IDistrictService districtService = SpringUtils.getBean(IDistrictService.class);
- 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()));
- }
- }
return page.setRecords(baseMapper.selectArticlePage(page, article));
}
@@ -104,31 +54,6 @@
*/
@Override
public IPage<ArticleVO> selectArticlePageByApp(IPage<ArticleVO> page, ArticleVO article) {
- // 判断是否管理员
- if (AuthUtils.isAdministratorOrAdmin(SpringUtils.getRequestParam("roleName"))) {
- IDistrictService districtService = SpringUtils.getBean(IDistrictService.class);
- String communityCode = SpringUtils.getRequestParam("communityCode");
- List<DistrictEntity> list = districtService.list(Wrappers.<DistrictEntity>lambdaQuery()
- .like(DistrictEntity::getCommunityCode, communityCode));
- if (list.size() > 0) {
- article.setDistrictIdList(list.stream().map(item -> item.getId()).collect(Collectors.toList()));
- }
- } else {
- // 查询用户小区的id
- String districId = baseMapper.getDistrictId(article.getHouseCode());
- List<String> objects = new ArrayList<>();
- objects.add(districId);
- article.setDistrictIdList(objects);
- }
- 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)
- .last("limit 1"));
- if (householdEntity != null) {
- article.setHouseholdId(householdEntity.getId());
- }
List<ArticleVO> articleVOS = baseMapper.selectArticlePageByApp(page, article);
return page.setRecords(articleVOS);
}
@@ -233,6 +158,7 @@
integralEntity.setScore(article.getScore());
integralEntity.setArticleId(id);
integralEntity.setHouseCode(houseCode);
+ integralEntity.setCreateUser(AuthUtil.getUserId());
// 插入记录
update = SpringUtils.getBean(IArticleIntegralService.class).save(integralEntity);
}
--
Gitblit v1.9.3