|
@@ -148,7 +148,6 @@
|
|
|
p.pkg_sn as package_sn,
|
|
|
u1.username as phone from wm_score_package_status s
|
|
|
left join wm_score_package p on p.id=s.package_id
|
|
|
- left join sys_user u on u.dept_id=p.send_package_dept_id
|
|
|
left join sys_user u1 on u1.user_id = s.user_id
|
|
|
where s.del_flag=0 and p.del_flag=0
|
|
|
and p.typeid=4
|
|
@@ -178,8 +177,12 @@
|
|
|
</foreach>
|
|
|
</if>
|
|
|
<if test="query.deptId != null">
|
|
|
+ and s.dept_id = #{query.deptId}
|
|
|
and p.dept_id = #{query.deptId}
|
|
|
</if>
|
|
|
+ <if test="query.phone != null and query.phone != ''">
|
|
|
+ and u1.username like concat('%',#{query.phone},'%')
|
|
|
+ </if>
|
|
|
order by s.create_time desc
|
|
|
</select>
|
|
|
|