From 26dde2ef091529e19b4e61ec98f042c1f30544a3 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Thu, 23 Jun 2022 16:07:53 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=87=E6=BB=A4=E5=88=A0=E9=99=A4=E6=A0=87?= =?UTF-8?q?=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epdc-cloud-admin/src/main/resources/mapper/SysDeptDao.xml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/epdc-cloud-admin/src/main/resources/mapper/SysDeptDao.xml b/epdc-cloud-admin/src/main/resources/mapper/SysDeptDao.xml index 0e8722e..e658185 100644 --- a/epdc-cloud-admin/src/main/resources/mapper/SysDeptDao.xml +++ b/epdc-cloud-admin/src/main/resources/mapper/SysDeptDao.xml @@ -398,7 +398,8 @@ LEFT JOIN sys_dept comm ON comm.id = grid.pid LEFT JOIN sys_dept street ON street.id = comm.pid WHERE - grid.type_key LIKE '%grid_party%' + grid.del_flag = '0' + AND grid.type_key LIKE '%grid_party%' AND grid.name = #{gridName} @@ -417,7 +418,7 @@ sys_dept d LEFT JOIN sys_dept p ON d.pid = p.id - + AND d.del_flag = '0' AND d.type_key in ('street_party','community_party','grid_party') and d.type_key = #{tags} @@ -445,7 +446,8 @@ sys_dept d LEFT JOIN sys_dept p ON p.id = d.pid WHERE - d.id = #{agencyId} + d.del_flag = '0' + AND d.id = #{agencyId} AND p.pid != 0 AND d.type_key in ('street_party','community_party','grid_party')