Merge remote-tracking branch 'origin/master'

This commit is contained in:
lSun 2025-04-25 14:29:29 +08:00
commit ed712ab351
1 changed files with 1 additions and 1 deletions

View File

@ -78,7 +78,7 @@
) B ON B.dict_value = tp.voltage_level
where tp.is_active = '1'
<if test="departName != '' and departName != null">and td.depart_name like concat('%', #{departName}, '%')</if>
<if test="proName != '' and proName != null"> and tp.pro_name = #{proName}</if>
<if test="proName != '' and proName != null"> and tp.pro_name like concat('%', #{proName}, '%')</if>
<if test="proStatus != '' and proStatus != null"> and tp.pro_status = #{proStatus}</if>
</select>
<select id="getTbProjectById" resultType="com.bonus.digitalSignage.basic.vo.TbProjectVo">