From 1cd37ba9db4b4b52b441978dfcaa37610418d98b Mon Sep 17 00:00:00 2001
From: yuxc <653031404@qq.com>
Date: 星期一, 25 九月 2023 09:32:20 +0800
Subject: [PATCH] 1、增加标准请码界面,授权了的才能查询到,编码分类树查询接口。

---
 Source/UBCS/ubcs-service/ubcs-system/src/main/resources/mapper/StrategyMapper.xml |   19 +++++++++++++------
 1 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/Source/UBCS/ubcs-service/ubcs-system/src/main/resources/mapper/StrategyMapper.xml b/Source/UBCS/ubcs-service/ubcs-system/src/main/resources/mapper/StrategyMapper.xml
index 83969fb..f7043dd 100644
--- a/Source/UBCS/ubcs-service/ubcs-system/src/main/resources/mapper/StrategyMapper.xml
+++ b/Source/UBCS/ubcs-service/ubcs-system/src/main/resources/mapper/StrategyMapper.xml
@@ -25,10 +25,15 @@
     <!--鏌ヨ鎸囧畾琛屾暟鎹�-->
     <select id="queryAllByPage" resultMap="StrategyMap">
         select pss.*,
-               (select WM_CONCAT(psc.NAME)
+               (SELECT listagg(psc.NAME,',') within GROUP(ORDER BY psc.NAME asc)
                 from PL_SYS_COMBINATION psc
                 where instr(pss.COMBINATION_IDS,psc.ID) > 0) COMBINATIONNAMES
         from PL_SYS_PWDSTRATEGY pss
+        <where>
+            <if test="tenantId != null and tenantId != ''">
+                TENANT_ID = #{tenantId}
+            </if>
+        </where>
     </select>
 
     <!--缁熻鎬昏鏁�-->
@@ -87,19 +92,18 @@
         </where>
     </select>
 
-
     <select id="queryByNameAndTenantId" resultMap="StrategyMap">
-        SELECT PSS.*,(select WM_CONCAT(psc.NAME)
+        SELECT PSS.*,(SELECT listagg(psc.NAME,',') within GROUP(ORDER BY psc.NAME asc)
                       from PL_SYS_COMBINATION psc
                       where instr(pss.COMBINATION_IDS,psc.ID) > 0) COMBINATIONNAMES
         FROM PL_SYS_PWDSTRATEGY PSS
               LEFT JOIN PL_SYS_USER_PWDSTRATEGY PSUP ON PSS.ID=PSUP.PWDSTRATEGY_ID
               LEFT JOIN PL_ORG_USER POU ON POU.ID=PSUP.USER_ID
-        WHERE POU.TENANT_ID = #{tenantId} AND POU.NAME=#{name};
+        WHERE POU.TENANT_ID = #{tenantId} AND POU.ACCOUNT=#{name} AND POU.IS_DELETED = 0;
     </select>
 
     <select id="queryByUserId" resultMap="StrategyMap">
-        SELECT PSS.*,(select WM_CONCAT(psc.NAME)
+        SELECT PSS.*,(SELECT listagg(psc.NAME,',') within GROUP(ORDER BY psc.NAME asc)
                       from PL_SYS_COMBINATION psc
                       where instr(pss.COMBINATION_IDS,psc.ID) > 0) COMBINATIONNAMES
         FROM PL_SYS_PWDSTRATEGY PSS LEFT JOIN PL_SYS_USER_PWDSTRATEGY PSUP ON PSS.ID=psup.PWDSTRATEGY_ID
@@ -107,11 +111,14 @@
     </select>
 
     <select id="queryByIsDefault" resultType="com.vci.ubcs.system.entity.Strategy">
-        SELECT PSS.*,(SELECT WM_CONCAT(psc.NAME)
+        SELECT PSS.*,(SELECT listagg(psc.NAME,',') within GROUP(ORDER BY psc.NAME asc)
                       FROM PL_SYS_COMBINATION psc
                       WHERE instr(pss.COMBINATION_IDS, psc.ID) > 0) COMBINATIONNAMES
         FROM PL_SYS_PWDSTRATEGY PSS
         WHERE is_default = 1
+        <if test="tenantId != null and tenantId != ''">
+            and TENANT_ID = #{tenantId}
+        </if>
     </select>
 
 </mapper>

--
Gitblit v1.9.3