|
|
@@ -198,8 +198,9 @@
|
|
|
<select id="findUserListByPage" parameterType="String" resultType="com.goafanti.user.bo.UserListBo">
|
|
|
select u.id ,u.mobile, u.email, u.create_time as createTime,
|
|
|
u.number , i.aft_username as aftUsername, i.audit_status as auditStatus, a.name as adminName
|
|
|
- from user u LEFT JOIN admin a on a.id = u.aid
|
|
|
- LEFT JOIN user_identity i
|
|
|
+ from user u
|
|
|
+ LEFT JOIN admin a on a.id = u.aid
|
|
|
+ LEFT JOIN user_identity i
|
|
|
ON u.id = i.uid where u.type = 0
|
|
|
<if test = "mobile != null">
|
|
|
and u.mobile = #{mobile,jdbcType=VARCHAR}
|
|
|
@@ -222,6 +223,7 @@
|
|
|
<if test="auditStatus != null">
|
|
|
and i.audit_status= #{auditStatus,jdbcType=INTEGER}
|
|
|
</if>
|
|
|
+ order by u.create_time desc
|
|
|
<if test="page_sql!=null">
|
|
|
${page_sql}
|
|
|
</if>
|
|
|
@@ -257,8 +259,10 @@
|
|
|
|
|
|
<select id="findOrgListByPage" parameterType="String" resultType="com.goafanti.user.bo.OrgListBo">
|
|
|
select u.id ,u.mobile, u.email, u.create_time as createTime,
|
|
|
- u.number , o.aft_username as aftUsername, o.audit_status as auditStatus, a.name as adminName
|
|
|
- from user u LEFT JOIN admin a on a.id = u.aid
|
|
|
+ u.number , o.aft_username as aftUsername, o.audit_status as auditStatus, a.name as adminName,
|
|
|
+ o.unit_name as unitName
|
|
|
+ from user u
|
|
|
+ LEFT JOIN admin a on a.id = u.aid
|
|
|
LEFT JOIN organization_identity o
|
|
|
ON u.id = o.uid
|
|
|
WHERE u.type = 1
|
|
|
@@ -284,6 +288,7 @@
|
|
|
<if test="auditStatus != null">
|
|
|
and o.audit_status= #{auditStatus,jdbcType=INTEGER}
|
|
|
</if>
|
|
|
+ order by u.create_time desc
|
|
|
<if test="page_sql!=null">
|
|
|
${page_sql}
|
|
|
</if>
|