From a5cbdeae376dae2353db26826de2471c1b35ac68 Mon Sep 17 00:00:00 2001
From: zpl <pzl_7001@163.com>
Date: Tue, 26 Oct 2021 11:14:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8C=89=E6=88=90=E6=9C=AC=E4=B8=AD=E5=BF=83?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=93=8D=E4=BD=9C=E5=91=98=E5=8F=8A=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87?=
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       |  9 ++++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/dispatch/src/main/resources/mapper/UserResourceMapper.xml b/dispatch/src/main/resources/mapper/UserResourceMapper.xml
index 3c958109..045d870d 100644
--- a/dispatch/src/main/resources/mapper/UserResourceMapper.xml
+++ b/dispatch/src/main/resources/mapper/UserResourceMapper.xml
@@ -487,7 +487,15 @@
                  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 = #{resourceType}
+        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})
+                )
     </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 7cc0768e..a2fe89c1 100644
--- a/meapi/src/main/resources/mapper/ResrceMapper.xml
+++ b/meapi/src/main/resources/mapper/ResrceMapper.xml
@@ -604,7 +604,14 @@
         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 = #{resourceType}
+        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})
+        )
         AND ZR.USER_ID IN
         <foreach collection="userList" item="item" open="(" close=")" separator="," >
             #{item}