Merge remote-tracking branch 'origin/master'

zhongrj

2024-11-25 a09e361bfcb68a809e9143eca87bed2d66af2216

 src/main/java/org/springblade/modules/yw/mapper/RiskSourceMapper.xml

@@ -20,7 +20,7 @@
    <select id="selectRiskSourcePage" resultType="org.springblade.modules.yw.vo.RiskSourceVO">
        select
        yrs.*,
        yfi.name as firmName,yfi.category,yfi.main_product,
        yfi.name as firmName,yfi.category,yfi.main_product,yfi.lng,yfi.lat,
        bdb.dict_value as riskLevelName
        from
        yw_risk_source yrs
@@ -30,6 +30,9 @@
        <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>