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

liujun-2024-05-23-接口漏洞修复
liujun 2024-04-24 17:20:54 +08:00
commit 1dd6b0fdea
2 changed files with 9 additions and 0 deletions

View File

@ -133,6 +133,9 @@
<if test="pd.DEPARTMENT_ID != null and pd.DEPARTMENT_ID != ''"><!-- 关键词检索 -->
and dept.DEPARTMENT_ID = #{pd.DEPARTMENT_ID}
</if>
<if test="pd.ADDSTART != null and pd.ADDSTART != '' and pd.ADDEND != null and pd.ADDEND != ''"><!-- 日期范围检索 -->
and DATE(f.CREATTIME) between DATE(#{pd.ADDSTART}) and DATE(#{pd.ADDEND})
</if>
and dept.`NAME` is not null
GROUP BY
f.PROMISE_ID

View File

@ -219,6 +219,9 @@
<if test="pd.USER_ID != null and pd.USER_ID != ''"><!-- 关键词检索 -->
and f.USER_ID = #{pd.USER_ID}
</if>
<if test="pd.STARTTIME != null and pd.STARTTIME != '' and pd.ENDTIME != null and pd.ENDTIME != ''"><!-- 日期范围检索 -->
and DATE(f.SIGNTIME) between DATE(#{pd.STARTTIME}) and DATE(#{pd.ENDTIME})
</if>
AND f.ISPROMISE_PEOPLE = '0'
ORDER BY f.SIGNTIME desc
</select>
@ -242,6 +245,9 @@
and f.PROMISE_NAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
</if>
AND f.ISPROMISE_PEOPLE = '0'
<if test="pd.STARTTIME != null and pd.STARTTIME != '' and pd.ENDTIME != null and pd.ENDTIME != ''"><!-- 日期范围检索 -->
and DATE(f.SIGNTIME) between DATE(#{pd.STARTTIME}) and DATE(#{pd.ENDTIME})
</if>
ORDER BY f.SIGNTIME desc
</select>