Merge remote-tracking branch 'origin/dev' into dev

dev
xiepeng 2024-04-08 18:02:11 +08:00
commit 02c5294ae1
1 changed files with 1 additions and 1 deletions

View File

@ -104,7 +104,7 @@
from from
<include refid="tableName"></include> f <include refid="tableName"></include> f
left join bus_corp_info b on b.CORPINFO_ID = f.CORPINFO_ID left join bus_corp_info b on b.CORPINFO_ID = f.CORPINFO_ID
left join sys_dictionaries d on d.BIANMA = f.CHECKTYPE_ID left join sys_dictionaries d on d.BIANMA = f.CHECKTYPE_ID and d.PARENT_ID = '5ef3a19edcb2435f8db94487834bbae3'
where f.ISDELETE = '0' where f.ISDELETE = '0'
<if test="pd.CHECKTYPE_ID != null and pd.CHECKTYPE_ID != ''"><!-- 关键词检索 --> <if test="pd.CHECKTYPE_ID != null and pd.CHECKTYPE_ID != ''"><!-- 关键词检索 -->
and f.CHECKTYPE_ID = #{pd.CHECKTYPE_ID} and f.CHECKTYPE_ID = #{pd.CHECKTYPE_ID}