From 051ccdbfdc1daec64187d28af1ca11e55649cd1e Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Wed, 21 Feb 2024 08:31:11 +0800
Subject: [PATCH] 租户查询调整
---
src/main/java/org/springblade/modules/house/vo/HouseRentalTenantVO.java | 5 +++++
src/main/java/org/springblade/common/param/CommonParamSet.java | 2 +-
src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.xml | 4 ++--
3 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/common/param/CommonParamSet.java b/src/main/java/org/springblade/common/param/CommonParamSet.java
index 52bb45d..55448d5 100644
--- a/src/main/java/org/springblade/common/param/CommonParamSet.java
+++ b/src/main/java/org/springblade/common/param/CommonParamSet.java
@@ -57,7 +57,7 @@
communityCodeField.set(t,communityCode);
}
}
- isAdministrator = AuthUtil.isAdministrator() == true || AuthUtil.isAdmin() == true ? 1 : 2;
+ isAdministrator = Strings.isBlank(roleName) && (AuthUtil.isAdministrator() == true || AuthUtil.isAdmin() == true) ? 1 : 2;
if (isAdministrator==2) {
// 获取当前用户的所属行政区划编号
regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
diff --git a/src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.xml b/src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.xml
index 2d1abd6..ca1a811 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.xml
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.xml
@@ -61,13 +61,13 @@
<if test="vo.roleName=='wgy'">
<choose>
<when test="gridCodeList !=null and gridCodeList.size()>0">
- and jp.grid_code in
+ and jh.grid_code in
<foreach collection="gridCodeList" item="code" open="(" close=")" separator=",">
#{code}
</foreach>
</when>
<otherwise>
- and jp.grid_code in ('')
+ and jh.grid_code in ('')
</otherwise>
</choose>
</if>
diff --git a/src/main/java/org/springblade/modules/house/vo/HouseRentalTenantVO.java b/src/main/java/org/springblade/modules/house/vo/HouseRentalTenantVO.java
index f2be28c..41b4ebf 100644
--- a/src/main/java/org/springblade/modules/house/vo/HouseRentalTenantVO.java
+++ b/src/main/java/org/springblade/modules/house/vo/HouseRentalTenantVO.java
@@ -60,5 +60,10 @@
private Long userId;
+ /**
+ * 社区编号
+ */
+ private String communityCode;
+
}
--
Gitblit v1.9.3