合并分支 'dev_foton_CD' 到 'FOTON'

bug64762

查看合并请求 laws-foton-slrs/foton-slrs-system-rest!13
This commit is contained in:
陈栋
2023-01-06 16:44:54 +08:00
@@ -482,7 +482,9 @@
)
where 1=1
<trim suffixOverrides="," >
<if test="QCDW != null and QCDW != ''" >
and SAR_BUSS_STAND_ATTR_INFO.QCDW like concat(concat('%',#{QCDW}),'%')
</if>
<if test="putTime!=null">
and put_time=#{putTime}
</if>
@@ -649,7 +651,9 @@
and (SAR_BUSSIONESS_STAND.STAND_CODE = #{standCode}
or REPLACE( SAR_BUSSIONESS_STAND.STAND_CODE,' ','') = REPLACE( #{standCode},' ',''))
</if>
<if test="QCDW != null and QCDW != ''" >
and SAR_BUSS_STAND_ATTR_INFO.QCDW like concat(concat('%',#{QCDW}),'%')
</if>
<!--<if test="menuId != null and menuId =='nomenu' and menuAllChildrenIdList != null and menuAllChildrenIdList.size()>0 and sarMsType != null and sarMsType == 'filterSarMsMenu'" >-->
<!--and SAR_BUSS_STAND_MENU.MENU_ID IS NULL-->