hzya
/
kangarooDataCenterV3
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://ufidahz.com.cn:9015/root/kangarooDataCenterV3 into 237master

This commit is contained in:
lvleigang 2024-09-25 16:16:04 +08:00
parent 7cf2f6d3c0 5eea8dfb96
commit 9228089692
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
base-service/src/main/java/com/hzya/frame/sysnew/sendMessageLog/entity/SysSendMessageLogEntity.xml
View File

@ -94,14 +94,15 @@
<if test="sourceModelName != null and sourceModelName != ''"> and log.source_model_name = #{sourceModelName} </if> <if test="sourceModelName != null and sourceModelName != ''"> and log.source_model_name = #{sourceModelName} </if>
<if test="state != null"> and log.state = #{state} </if> <if test="state != null"> and log.state = #{state} </if>
<if test="resultMessage != null and resultMessage != ''"> and log.result_message = #{resultMessage} </if> <if test="resultMessage != null and resultMessage != ''"> and log.result_message = #{resultMessage} </if>
<if test="appId != null and appId != ''" > and app_id = #{appId} </if> <if test="appId != null and appId != ''" > and i.app_id = #{appId} </if>
and log.sts='Y' and log.sts='Y'
and p1.sts='Y' and p1.sts='Y'
and p2.sts='Y' and p2.sts='Y'
and i.sts='Y' and i.sts='Y'
</trim> </trim>
<if test=" sort == null or sort == ''.toString() "> order by log.sorts asc</if> <!-- <if test=" sort == null or sort == ''.toString() "> order by log.sorts asc</if>-->
<if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if> <!-- <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>-->
order by log.send_datetime desc
</select> </select>
<!-- 查询符合条件的数量 --> <!-- 查询符合条件的数量 -->
@ -178,8 +179,9 @@
and p2.sts='Y' and p2.sts='Y'
and app.sts='Y' and app.sts='Y'
</trim> </trim>
<if test=" sort == null or sort == ''.toString() "> order by log.sorts asc</if> <!-- <if test=" sort == null or sort == ''.toString() "> order by log.sorts asc</if>-->
<if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if> <!-- <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>-->
order by log.send_datetime desc
</select> </select>
<!-- 查询列表 字段采用or格式 --> <!-- 查询列表 字段采用or格式 -->