|
|
@@ -183,17 +183,17 @@
|
|
|
e.entry_date_,e.demission_date_,e.organ_id_list_ organ_id_,e.create_time_
|
|
|
FROM employee e LEFT JOIN sys_user su ON e.user_id_ = su.id_
|
|
|
<where>
|
|
|
+ su.user_type_ = 'SYSTEM'
|
|
|
<if test="organId != null">
|
|
|
- FIND_IN_SET(su.organ_id_,#{organId})
|
|
|
+ AND FIND_IN_SET(su.organ_id_,#{organId})
|
|
|
</if>
|
|
|
</where>
|
|
|
ORDER BY e.create_time_ DESC <include refid="global.limit"/>) ue
|
|
|
LEFT JOIN sys_user_role sur ON sur.user_id_ = ue.user_id_
|
|
|
LEFT JOIN sys_role sr ON sr.id_ = sur.role_id_
|
|
|
LEFT JOIN organization o ON FIND_IN_SET(o.id_,ue.organ_id_)
|
|
|
- WHERE ue.user_type_ = 'SYSTEM'
|
|
|
<if test="search != null">
|
|
|
- AND (ue.real_name_ LIKE CONCAT('%',#{search},'%') OR ue.phone_ LIKE CONCAT('%',#{search},'%'))
|
|
|
+ WHERE (ue.real_name_ LIKE CONCAT('%',#{search},'%') OR ue.phone_ LIKE CONCAT('%',#{search},'%'))
|
|
|
</if>
|
|
|
</select>
|
|
|
|
zouxuan