From 9bbc18a1091fddbb42257101676ffcb4794ee31d Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Tue, 28 Apr 2020 10:27:35 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=EF=BC=9A=E9=83=A8=E5=88=86?=
 =?UTF-8?q?sql=E8=AF=AD=E5=8F=A5=E6=B2=A1=E6=9C=89=E5=8A=A0del=5Fflag=3D0?=
 =?UTF-8?q?=E7=9A=84=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/OperationScopeDao.xml             | 2 ++
 .../src/main/resources/mapper/RoleOperationDao.xml              | 2 ++
 .../src/main/resources/mapper/GovStaffRoleDao.xml               | 1 +
 .../src/main/resources/mapper/StaffRoleDao.xml                  | 2 ++
 4 files changed, 7 insertions(+)

diff --git a/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/OperationScopeDao.xml b/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/OperationScopeDao.xml
index ab6839e941..8b07df685d 100644
--- a/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/OperationScopeDao.xml
+++ b/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/OperationScopeDao.xml
@@ -23,6 +23,8 @@
                           on (rs.SCOPE_KEY = os.SCOPE_KEY)
         where rs.ROLE_ID = #{roleId}
           and rs.OPERATION_KEY = #{operationKey}
+          and rs.DEL_FLAG = '0'
+          and os.DEL_FLAG = '0'
     </select>
 
 
diff --git a/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/RoleOperationDao.xml b/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/RoleOperationDao.xml
index 0845fc5202..ebde0d7c2c 100644
--- a/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/RoleOperationDao.xml
+++ b/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/RoleOperationDao.xml
@@ -27,6 +27,8 @@
             INNER JOIN operation o ON ( ro.OPERATION_KEY = o.OPERATION_KEY )
         WHERE
             ro.ROLE_ID = #{roleId}
+            and ro.DEL_FLAG = '0'
+            and o.DEL_FLAG = '0'
     </select>
 
 
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/GovStaffRoleDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/GovStaffRoleDao.xml
index e5c4449733..d3de570592 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/GovStaffRoleDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/GovStaffRoleDao.xml
@@ -28,6 +28,7 @@
             sr.STAFF_ID = #{staffId}
             AND sr.ORG_ID = #{orgId}
             AND sr.DEL_FLAG = '0'
+            AND r.DEL_FLAG = '0'
     </select>
     <select id="selectGovStaffRoleList" resultType="com.epmet.dto.GovStaffRoleDTO" parameterType="com.epmet.dto.GovStaffRoleDTO">
         select
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/StaffRoleDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/StaffRoleDao.xml
index 088bd0478f..b70e0e318b 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/StaffRoleDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/StaffRoleDao.xml
@@ -34,6 +34,8 @@
         WHERE
             r.ROLE_KEY = #{roleKey}
             AND sr.ORG_ID = #{orgId}
+            AND r.DEL_FLAG = '0'
+            AND r.DEL_FLAG = '0'
     </select>