tangzheng/block-health-record
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:elunez/eladmin-mp

Browse Source
This commit is contained in:
Zheng Jie 2024-04-02 20:33:19 +08:00
commit c13cf4da0c
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
eladmin/eladmin-system/src/main/resources/mapper/quartz/QuartzLogMapper.xml
View File

@ -27,7 +27,7 @@
<if test="criteria.jobName != null and criteria.jobName != ''">
AND job_name LIKE CONCAT('%',#{criteria.jobName},'%')
</if>
<if test="criteria.isSuccess != null and criteria.isSuccess != ''">
<if test="criteria.isSuccess != null">
AND is_success = #{criteria.isSuccess}
</if>
<if test="criteria.createTime != null and criteria.createTime.size() > 0">

3
eladmin/eladmin-system/src/main/resources/mapper/system/UserMapper.xml
View File

@ -60,9 +60,6 @@
<if test="criteria.enabled != null">
and u.enabled = #{criteria.enabled}
</if>
<if test="criteria.deptId != null">
and u.dept_id = #{criteria.deptId}
</if>
<if test="criteria.deptIds != null and criteria.deptIds.size() != 0">
and u.dept_id in
<foreach collection="criteria.deptIds" item="deptId" open="(" separator="," close=")">