From 30b4c7117d51ce770de4371e022f0b810e6cd31d Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Tue, 21 Nov 2023 15:38:19 +0800
Subject: [PATCH] 临时处理万达个例用户数据筛选
---
src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml | 8 +++++++-
src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java | 9 +++++++--
src/main/java/org/springblade/modules/house/vo/HouseParam.java | 5 +++++
3 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml b/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml
index 6a11449..b010522 100644
--- a/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml
+++ b/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml
@@ -5,7 +5,7 @@
<!--过滤网格数据-->
<sql id="filterHouseGrid">
<if test="houseParam.roleName!=null and houseParam.roleName!=''">
- <if test="houseParam.roleName=='网格员'">
+ <if test="houseParam.roleName=='网格员' and houseParam.userId!='1726859808689696770'">
<choose>
<when test="list != null and list.size()>0">
and address_code in
@@ -43,6 +43,9 @@
<select id="getRegionListByGroupTwon" resultType="org.springblade.common.node.TreeNode" >
select town_street_code as id,town_street_name as name from jczz_doorplate_address
where 1=1
+ <if test="houseParam.userId!=null and houseParam.userId!='' and houseParam.userId=='1726859808689696770'">
+ and nei_name = '万达社区居民委员会'
+ </if>
<include refid="filterHouseGrid"/>
group by town_street_code,town_street_name
</select>
@@ -51,6 +54,9 @@
<select id="getRegionListByGroupNei" resultType="org.springblade.common.node.TreeNode" >
select nei_code as id,nei_name as name,town_street_code as parentId from jczz_doorplate_address
where 1=1
+ <if test="houseParam.userId!=null and houseParam.userId!='' and houseParam.userId=='1726859808689696770'">
+ and nei_name = '万达社区居民委员会'
+ </if>
<include refid="filterHouseGrid"/>
group by nei_code,nei_name,town_street_code
</select>
diff --git a/src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java b/src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java
index 86ef42f..97f77d7 100644
--- a/src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java
+++ b/src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java
@@ -20,6 +20,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.qiniu.util.Auth;
import liquibase.repackaged.org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.util.Strings;
import org.springblade.common.constant.DictConstant;
@@ -87,10 +88,12 @@
@Override
public Object getFuncList(Integer type,String roleName) {
HouseParam houseParam = new HouseParam();
+ String userId = AuthUtil.getUserId().toString();
+ houseParam.setUserId(userId);
List<String> stringList = new ArrayList<>();
if (null!=roleName && !roleName.equals("")){
houseParam.setRoleName(roleName);
- if (roleName.equals("网格员")){
+ if (roleName.equals("网格员") && !userId.equals("1726859808689696770")){
// 查询对应的房屋地址code
stringList = gridService.getAddressCodeListByUserId(AuthUtil.getUserId());
}
@@ -537,8 +540,10 @@
*/
private List<String> getHouseCodeList(HouseParam houseParam) {
List<String> stringList = new ArrayList<>();
+ String userId = AuthUtil.getUserId().toString();
+ houseParam.setUserId(userId);
if (null != houseParam.getRoleName() && !houseParam.getRoleName().equals("")) {
- if (houseParam.getRoleName().equals("网格员")) {
+ if (houseParam.getRoleName().equals("网格员") && !userId.equals("1726859808689696770")) {
// 查询对应的房屋地址code
stringList = gridService.getAddressCodeListByUserId(AuthUtil.getUserId());
}
diff --git a/src/main/java/org/springblade/modules/house/vo/HouseParam.java b/src/main/java/org/springblade/modules/house/vo/HouseParam.java
index a1d9ddb..7834ffa 100644
--- a/src/main/java/org/springblade/modules/house/vo/HouseParam.java
+++ b/src/main/java/org/springblade/modules/house/vo/HouseParam.java
@@ -46,4 +46,9 @@
* 商超写字楼名称
*/
private String buildingName;
+
+ /**
+ * 商超写字楼名称
+ */
+ private String userId;
}
--
Gitblit v1.9.3