From c0f21a9745daa3afef19110025bdee9d0ba00338 Mon Sep 17 00:00:00 2001
From: ludc <2870569285@qq.com>
Date: 星期日, 26 三月 2023 01:29:15 +0800
Subject: [PATCH] 更新部分后端代码
---
Source/BladeX/blade-service/blade-system/src/main/java/org/springblade/system/mapper/StrategyMapper.xml | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/Source/BladeX/blade-service/blade-system/src/main/java/org/springblade/system/mapper/StrategyMapper.xml b/Source/BladeX/blade-service/blade-system/src/main/java/org/springblade/system/mapper/StrategyMapper.xml
index 5b3e32f..385b072 100644
--- a/Source/BladeX/blade-service/blade-system/src/main/java/org/springblade/system/mapper/StrategyMapper.xml
+++ b/Source/BladeX/blade-service/blade-system/src/main/java/org/springblade/system/mapper/StrategyMapper.xml
@@ -20,7 +20,6 @@
<result property="updateTime" column="UPDATE_TIME" jdbcType="TIMESTAMP"/>
<result property="updateUser" column="UPDATE_USER" jdbcType="TIMESTAMP"/>
<result property="combinationNames" column="COMBINATIONNAMES"/>
- <result property="regex" column="REGEX"/>
</resultMap>
<!--鏌ヨ鎸囧畾琛屾暟鎹�-->
@@ -90,16 +89,30 @@
<select id="queryByNameAndTenantId" resultMap="StrategyMap">
- SELECT PSS.* FROM PL_SYS_STRATEGY PSS
+ SELECT PSS.*,(select WM_CONCAT(psc.NAME)
+ from PL_SYS_COMBINATION psc
+ where instr(pss.COMBINATION_IDS,psc.ID) > 0) COMBINATIONNAMES
+ FROM PL_SYS_STRATEGY 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};
</select>
<select id="queryByUserId" resultMap="StrategyMap">
- SELECT PSS.* FROM PL_SYS_STRATEGY PSS LEFT JOIN PL_SYS_USER_PWDSTRATEGY PSUP ON PSS.ID=psup.PWDSTRATEGY_ID
+ SELECT PSS.*,(select WM_CONCAT(psc.NAME)
+ from PL_SYS_COMBINATION psc
+ where instr(pss.COMBINATION_IDS,psc.ID) > 0) COMBINATIONNAMES
+ FROM PL_SYS_STRATEGY PSS LEFT JOIN PL_SYS_USER_PWDSTRATEGY PSUP ON PSS.ID=psup.PWDSTRATEGY_ID
WHERE PSUP.USER_ID = #{userId}
</select>
+ <select id="queryByIsDefault" resultType="org.springblade.system.entity.Strategy">
+ SELECT PSS.*,(SELECT WM_CONCAT(psc.NAME)
+ FROM PL_SYS_COMBINATION psc
+ WHERE instr(pss.COMBINATION_IDS, psc.ID) > 0) COMBINATIONNAMES
+ FROM PL_SYS_STRATEGY PSS
+ WHERE is_default = 1
+ </select>
+
</mapper>
--
Gitblit v1.9.3