|
@@ -139,7 +139,7 @@
|
|
|
left join sys_user u1 on u1.user_id = s.user_id
|
|
left join sys_user u1 on u1.user_id = s.user_id
|
|
|
where s.del_flag=0 and p.del_flag=0
|
|
where s.del_flag=0 and p.del_flag=0
|
|
|
and p.typeid=4
|
|
and p.typeid=4
|
|
|
- and p.source_type = '0'
|
|
|
|
|
|
|
+ and (p.source_type = '0' or p.source_type is null)
|
|
|
<if test="query.id!=null and query.id!=''">
|
|
<if test="query.id!=null and query.id!=''">
|
|
|
and s.id=#{query.id}
|
|
and s.id=#{query.id}
|
|
|
</if>
|
|
</if>
|
|
@@ -164,6 +164,9 @@
|
|
|
#{teamId}
|
|
#{teamId}
|
|
|
</foreach>
|
|
</foreach>
|
|
|
</if>
|
|
</if>
|
|
|
|
|
+ <if test="query.deptId != null">
|
|
|
|
|
+ and p.dept_id = #{query.deptId}
|
|
|
|
|
+ </if>
|
|
|
order by s.create_time desc
|
|
order by s.create_time desc
|
|
|
</select>
|
|
</select>
|
|
|
|
|
|
