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/rotation/service/impl/RotationServiceImpl.java | 6 ++++++
src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.xml | 15 ++++++++++-----
2 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/springblade/modules/rotation/service/impl/RotationServiceImpl.java b/src/main/java/org/springblade/modules/rotation/service/impl/RotationServiceImpl.java
index f06978a..c9ed1c8 100644
--- a/src/main/java/org/springblade/modules/rotation/service/impl/RotationServiceImpl.java
+++ b/src/main/java/org/springblade/modules/rotation/service/impl/RotationServiceImpl.java
@@ -93,6 +93,12 @@
}
rotation.setPropertyFlag(1);
}
+ if(AuthUtils.isMj(userRole)){
+ rotation.setType(1);
+ }
+ if(AuthUtils.isJd(userRole)){
+ rotation.setType(2);
+ }
if (StringUtils.isNotBlank(rotation.getAoiCode())) {
// 查询房屋的小区
IDistrictService bean = SpringUtils.getBean(IDistrictService.class);
diff --git a/src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.xml b/src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.xml
index 2920127..704caba 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.xml
@@ -224,7 +224,7 @@
<foreach collection="aoiCodeList" item="item" separator="," open="(" close=")">
#{item}
</foreach>
- or
+ or
jp.aoi_code in
<foreach collection="aoiCodeList" item="item" separator="," open="(" close=")">
#{item}
@@ -237,7 +237,7 @@
</if>
</if>
<!-- 其他 -->
- <if test="vo.roleType ==null">
+ <if test="vo.roleType ==null and vo.roleName !='wgy' ">
<choose>
<when test="regionChildCodesList !=null and regionChildCodesList.size()>0">
and (
@@ -255,7 +255,7 @@
</choose>
</if>
<!-- 网格员 -->
- <if test="vo.roleName =='wgy'">
+ <if test="vo.roleName =='wgy' ">
<choose>
<when test="gridCodeList !=null and gridCodeList.size()>0">
and (
@@ -352,11 +352,15 @@
jczz_task_report_for_repairs jtr
LEFT JOIN jczz_house jh ON jh.house_code = jtr.address_code
LEFT JOIN jczz_place jp ON jtr.address_code = jp.house_code
+ LEFT JOIN jczz_grid jg on (jh.grid_code = jg.grid_code or jp.grid_code = jg.grid_code )
<where>
and jtr.is_deleted = 0
and jtr.confirm_flag = 1
+ <if test="neiCode !=null and neiCode !=''">
+ and jg.community_code = #{neiCode}
+ </if>
- <if test="userId != null and roleName == 'wgy'" >
+ <if test="userId != null and roleName == 'wgy'">
AND (
jp.grid_code IN (
SELECT
@@ -407,7 +411,8 @@
<!--更新状态-临时接口-->
<update id="updateView">
- update jczz_task_report_for_repairs set view_type = 1
+ update jczz_task_report_for_repairs
+ set view_type = 1
</update>
--
Gitblit v1.9.3