From c4e2c196aad8af656d94bc47e9f1a80bc504b5d7 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Thu, 14 Mar 2024 18:15:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/place/service/impl/PlaceExtServiceImpl.java | 69 +++++++++++++++++++++-------------
1 files changed, 43 insertions(+), 26 deletions(-)
diff --git a/src/main/java/org/springblade/modules/place/service/impl/PlaceExtServiceImpl.java b/src/main/java/org/springblade/modules/place/service/impl/PlaceExtServiceImpl.java
index e1237ea..3d90109 100644
--- a/src/main/java/org/springblade/modules/place/service/impl/PlaceExtServiceImpl.java
+++ b/src/main/java/org/springblade/modules/place/service/impl/PlaceExtServiceImpl.java
@@ -20,6 +20,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.logging.log4j.util.Strings;
+import org.springblade.common.param.CommonParamSet;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.modules.grid.service.IGridService;
import org.springblade.modules.place.entity.PlaceEntity;
@@ -30,7 +31,6 @@
import org.springblade.modules.place.service.IPlacePractitionerService;
import org.springblade.modules.place.service.IPlaceService;
import org.springblade.modules.place.vo.PlaceExtVO;
-import org.springblade.modules.system.entity.Dept;
import org.springblade.modules.system.service.IDeptService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -56,11 +56,11 @@
@Autowired
private IPlacePractitionerService placePractitionerService;
- @Autowired
- private IGridService gridService;
-
- @Autowired
- private IDeptService deptService;
+// @Autowired
+// private IGridService gridService;
+//
+// @Autowired
+// private IDeptService deptService;
/**
* 自定义查询
@@ -71,25 +71,38 @@
*/
@Override
public IPage<PlaceExtVO> selectPlaceExtPage(IPage<PlaceExtVO> page, PlaceExtVO placeExt) {
- List<String> list = new ArrayList<>();
- if (null != placeExt.getRoleName() && !placeExt.getRoleName().equals("")) {
- if (placeExt.getRoleName().equals("网格员")) {
- // 查询对应的房屋地址code
- list = gridService.getAddressCodeListByUserId(AuthUtil.getUserId());
- }
- if (!placeExt.getRoleName().equals("系统管理员")) {
- placeExt.setCreateUser(AuthUtil.getUserId());
- }
- }
- Dept dept = deptService.getById(AuthUtil.getDeptId());
- if (null != dept) {
- placeExt.setCommunityCode(dept.getRegionCode());
- }
- if (AuthUtil.getUserAccount().equals("18879306957")) {
- placeExt.setCommunityCode("361102003027");
- placeExt.setCreateUser(null);
- }
- return page.setRecords(baseMapper.selectPlaceExtPage(page, placeExt, list));
+// List<String> list = new ArrayList<>();
+// String roleName = SpringUtils.getRequestParam("roleName");
+// String communityCode = SpringUtils.getRequestParam("communityCode");
+// if (!Strings.isBlank(communityCode)){
+// // 校验社区编号是否合规
+// if(null!=SpringUtils.getBean(IRegionService.class).getById(communityCode)) {
+// placeExt.setCommunityCode(communityCode);
+// }
+// }
+// List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
+// Integer isAdministrator = AuthUtil.isAdministrator()==true?1:2;
+// // 网格编号集合
+// List<String> gridCodeList = new ArrayList<>();
+// // 民警角色
+// if (!Strings.isBlank(roleName)){
+// placeExt.setRoleName(roleName);
+// if(roleName.equals("mj")) {
+// regionChildCodesList = SpringUtil.getBean(IPoliceAffairsGridService.class).getCommunityCodeListByUserId(AuthUtil.getUserId());
+// }
+// if (roleName.equals("wgy")) {
+// gridCodeList = SpringUtil.getBean(IGridService.class).getGridListByUserId(AuthUtil.getUserId());
+// }
+// }
+// if (AuthUtil.getUserAccount().equals("18879306957")) {
+// placeExt.setCommunityCode("361102003027");
+// placeExt.setCreateUser(null);
+// }
+ CommonParamSet<Object> commonParamSet = new CommonParamSet<>().invoke(PlaceExtVO.class, placeExt);
+
+
+ return page.setRecords(baseMapper.selectPlaceExtPage(page, placeExt,commonParamSet.getRegionChildCodesList(),
+ commonParamSet.getIsAdministrator(),commonParamSet.getGridCodeList()));
}
/**
@@ -262,6 +275,10 @@
@Override
public Integer selectCount(Long userId, String neiCode, Integer confirmFlag) {
- return baseMapper.selectCount(userId, neiCode, confirmFlag);
+ PlaceExtVO placeExt = new PlaceExtVO();
+ placeExt.setConfirmFlag(confirmFlag);
+ placeExt.setNeiCode(neiCode);
+ CommonParamSet<Object> commonParamSet = new CommonParamSet<>().invoke(PlaceExtVO.class, placeExt);
+ return baseMapper.selectCount(placeExt,commonParamSet.getRegionChildCodesList(),commonParamSet.getIsAdministrator(),commonParamSet.getGridCodeList());
}
}
--
Gitblit v1.9.3