|
@@ -8,8 +8,8 @@
|
|
|
left join sys_user_depart c on b.id=c.user_id
|
|
|
left join sys_depart d on c.dep_id=d.id
|
|
|
where b.del_flag='0'
|
|
|
- <if test="userPrize.userId!=null and ''!=userPrize.userId">
|
|
|
- and b.realname like concat(concat('%',#{userPrize.userId}),'%')
|
|
|
+ <if test="userPrize.realname!=null and ''!=userPrize.realname">
|
|
|
+ and b.realname like concat(concat('%',#{userPrize.realname}),'%')
|
|
|
</if>
|
|
|
<if test="userPrize.deptId!=null and ''!=userPrize.deptId">
|
|
|
and d.depart_name like concat(concat('%',#{userPrize.deptId}),'%')
|
|
@@ -23,6 +23,9 @@
|
|
|
<if test="date!=null and ''!=date">
|
|
|
and date_format(a.date,'%Y-%m-%d')=date_format(#{date},'%Y-%m-%d')
|
|
|
</if>
|
|
|
+ <if test="userPrize.userId!=null and ''!=userPrize.userId">
|
|
|
+ and a.user_id=#{userPrize.userId}
|
|
|
+ </if>
|
|
|
</select>
|
|
|
<select id="queryDept" resultType="java.util.Map">
|
|
|
select d.id,d.depart_name as 'name' from sys_user_depart c
|
|
@@ -33,4 +36,5 @@
|
|
|
and a.id=#{userid}
|
|
|
</if>
|
|
|
</select>
|
|
|
+
|
|
|
</mapper>
|