From c317c36a47c274f72f2bca800a545d6f43223c7a Mon Sep 17 00:00:00 2001
From: zpl <pzl_7001@163.com>
Date: Wed, 27 Oct 2021 12:52:15 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E6=93=8D=E4=BD=9C=E5=91=98?=
 =?UTF-8?q?=E9=9D=A2=E6=9D=BF=E6=8C=89=E6=88=90=E6=9C=AC=E4=B8=AD=E5=BF=83?=
 =?UTF-8?q?=E7=BB=B4=E6=8A=A4=E6=93=8D=E4=BD=9C=E5=91=98=E5=8F=8A=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87--=E5=9B=9E=E9=80=80=EF=BC=8C=E5=8F=96=E6=B6=88?=
 =?UTF-8?q?=E6=88=90=E6=9C=AC=E4=B8=AD=E5=BF=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/UserResourceMapper.xml  | 10 +---------
 meapi/src/main/resources/mapper/ResrceMapper.xml      | 11 +----------
 2 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/dispatch/src/main/resources/mapper/UserResourceMapper.xml b/dispatch/src/main/resources/mapper/UserResourceMapper.xml
index d719b2df..3c958109 100644
--- a/dispatch/src/main/resources/mapper/UserResourceMapper.xml
+++ b/dispatch/src/main/resources/mapper/UserResourceMapper.xml
@@ -487,15 +487,7 @@
                  INNER JOIN RESOURCE_TYPE_RESOURCE WM ON WM.RESOURCE_BO = A.RESOURCE_BO
                  INNER JOIN RESOURCE_TYPE RT ON RT.HANDLE = WM.RESOURCE_TYPE_BO
                  LEFT JOIN Z_NWA_USER B ON A.SITE = B.SITE AND A.USER_ID = B.USER_NAME
-        WHERE A.SITE = #{site} AND
-            (RT.RESOURCE_TYPE IN (
-                SELECT O.OPERATION  FROM OPERATION o
-                INNER JOIN CUSTOM_FIELDS cf ON CF.HANDLE = O.HANDLE
-                WHERE CF.VALUE = (
-                    SELECT CF.VALUE FROM OPERATION o
-                    INNER JOIN CUSTOM_FIELDS cf ON CF.HANDLE = O.HANDLE AND CF."ATTRIBUTE" = 'COST_CENTER'
-                    WHERE O.OPERATION = #{resourceType})
-                )  OR RT.RESOURCE_TYPE = #{resourceType} )
+        WHERE A.SITE = #{site} AND RT.RESOURCE_TYPE = #{resourceType}
     </select>
 
     <select id="findAll" resultMap="UserResourceDto">
diff --git a/meapi/src/main/resources/mapper/ResrceMapper.xml b/meapi/src/main/resources/mapper/ResrceMapper.xml
index 8182d7ed..2510aa07 100644
--- a/meapi/src/main/resources/mapper/ResrceMapper.xml
+++ b/meapi/src/main/resources/mapper/ResrceMapper.xml
@@ -605,16 +605,7 @@
         INNER JOIN RESOURCE_TYPE_RESOURCE RTR ON RTR.RESOURCE_BO = RS.HANDLE
         INNER JOIN RESOURCE_TYPE RT ON RT.HANDLE = RTR.RESOURCE_TYPE_BO
         INNER JOIN Z_USER_RESOURCE ZR ON ZR.RESOURCE_BO = RS.HANDLE AND ZR.STATUS = 'true'
-        WHERE RT.SITE = #{site} AND (
-            RT.RESOURCE_TYPE IN (
-            SELECT O.OPERATION FROM OPERATION o
-            INNER JOIN CUSTOM_FIELDS cf ON CF.HANDLE = O.HANDLE
-            WHERE CF.VALUE = (
-            SELECT CF.VALUE FROM OPERATION o
-            INNER JOIN CUSTOM_FIELDS cf ON CF.HANDLE = O.HANDLE AND CF."ATTRIBUTE" = 'COST_CENTER'
-            WHERE O.OPERATION = #{resourceType})
-            ) OR RT.RESOURCE_TYPE = #{resourceType}
-        )
+        WHERE RT.SITE = #{site} AND RT.RESOURCE_TYPE = #{resourceType}
         AND ZR.USER_ID IN
         <foreach collection="userList" item="item" open="(" close=")" separator="," >
             #{item}