From a09e361bfcb68a809e9143eca87bed2d66af2216 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Mon, 25 Nov 2024 11:35:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/yw/mapper/RiskSourceMapper.xml | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/yw/mapper/RiskSourceMapper.xml b/src/main/java/org/springblade/modules/yw/mapper/RiskSourceMapper.xml
index 2adb77d..81d4a15 100644
--- a/src/main/java/org/springblade/modules/yw/mapper/RiskSourceMapper.xml
+++ b/src/main/java/org/springblade/modules/yw/mapper/RiskSourceMapper.xml
@@ -20,14 +20,22 @@
<select id="selectRiskSourcePage" resultType="org.springblade.modules.yw.vo.RiskSourceVO">
select
yrs.*,
- yfi.name as firmName
+ yfi.name as firmName,yfi.category,yfi.main_product,yfi.lng,yfi.lat,
+ bdb.dict_value as riskLevelName
from
yw_risk_source yrs
left join yw_firm_info yfi on yfi.id = yrs.firm_id and yfi.is_deleted = 0
+ left join blade_dict_biz bdb on bdb.dict_key = yrs.risk_level and bdb.code = 'risk_level'
where yrs.is_deleted = 0
<if test="riskSource.firmId!=null">
and yrs.firm_id = #{riskSource.firmId}
</if>
+ <if test="riskSource.name!=null and riskSource.name!=''">
+ and yrs.name like concat('%',#{riskSource.name},'%')
+ </if>
+ <if test="riskSource.riskLevel!=null">
+ and yrs.risk_level = #{riskSource.riskLevel}
+ </if>
</select>
<!--风险源统计查询-->
--
Gitblit v1.9.3