From 5a40d4d4791d2f3d7eae45703e2274c5022848ad Mon Sep 17 00:00:00 2001
From: zpl <pzl_7001@163.com>
Date: Tue, 26 Oct 2021 22:44:07 +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?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/UserResourceMapper.xml     | 4 ++--
 meapi/src/main/resources/mapper/ResrceMapper.xml         | 9 ++++++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/dispatch/src/main/resources/mapper/UserResourceMapper.xml b/dispatch/src/main/resources/mapper/UserResourceMapper.xml
index 045d870d..d719b2df 100644
--- a/dispatch/src/main/resources/mapper/UserResourceMapper.xml
+++ b/dispatch/src/main/resources/mapper/UserResourceMapper.xml
@@ -488,14 +488,14 @@
                  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 (
+            (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} )
     </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 a2fe89c1..8182d7ed 100644
--- a/meapi/src/main/resources/mapper/ResrceMapper.xml
+++ b/meapi/src/main/resources/mapper/ResrceMapper.xml
@@ -599,18 +599,21 @@
     </select>
 
     <select id="selectResourceListByUT" resultMap="BaseResultMap">
-        SELECT RS.HANDLE, RS.SITE, RS.RESRCE, RS.DESCRIPTION, RS.STATUS_BO, RS.PROCESS_RESOURCE, RS.OPERATION_BO, RS.VALID_FROM, RS.VALID_TO, RS.SETUP_STATE, RS.CREATED_DATE_TIME, RS.MODIFIED_DATE_TIME
+        SELECT RS.HANDLE, RS.SITE, RS.RESRCE, RS.DESCRIPTION, RS.STATUS_BO, RS.PROCESS_RESOURCE, RS.OPERATION_BO,
+        RS.VALID_FROM, RS.VALID_TO, RS.SETUP_STATE, RS.CREATED_DATE_TIME, RS.MODIFIED_DATE_TIME
         FROM RESRCE RS
         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
+        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}
         )
         AND ZR.USER_ID IN
         <foreach collection="userList" item="item" open="(" close=")" separator="," >