|
|
@@ -577,7 +577,7 @@
|
|
|
<select id="selectSignOrganizationCustomerList" resultType="com.goafanti.customer.bo.CustomerListOut">
|
|
|
select
|
|
|
t0.uid as uid,
|
|
|
- t3.last_sign_time as lastSignTime,
|
|
|
+ date_format(t3.last_sign_time,'%Y-%m-%d %H:%I:%S') as lastSignTime,
|
|
|
t1.last_follow_time as lastFollowTime,
|
|
|
t2.society_tag as societyTag,
|
|
|
t2.identify_name as name,
|
|
|
@@ -1840,7 +1840,7 @@ from
|
|
|
on b.location_city=c1.id left join district_glossory c2
|
|
|
on b.location_area=c2.id left join industry_category d
|
|
|
on b.industry = d.id
|
|
|
- where 1=1 and a.status=0
|
|
|
+ where a.status=0
|
|
|
<if test="type !=null and type!=''">
|
|
|
and a.`type`=#{type,jdbcType=VARCHAR}
|
|
|
</if>
|
|
|
@@ -1881,15 +1881,9 @@ from
|
|
|
order by a.create_time,a.nickname desc
|
|
|
)x
|
|
|
inner join(
|
|
|
- select
|
|
|
- id
|
|
|
- from
|
|
|
- admin
|
|
|
- where
|
|
|
- id = #{aid,jdbcType=VARCHAR}
|
|
|
- or superior_id = #{aid,jdbcType=VARCHAR}
|
|
|
- ) y on
|
|
|
- y.id = x.information_maintainer
|
|
|
+ select id from admin a
|
|
|
+ inner join (select department_id as depId from admin where id= #{aid,jdbcType=VARCHAR})b on a.department_id=b.depId
|
|
|
+ ) y on y.id = x.information_maintainer
|
|
|
<if test="page_sql != null">
|
|
|
${page_sql}
|
|
|
</if>
|
|
|
@@ -1897,11 +1891,8 @@ inner join(
|
|
|
<select id="selectDepCustomerInformationCount" resultType="java.lang.Integer">
|
|
|
select count(0)
|
|
|
from user a left join organization_identity b
|
|
|
- on a.id=b.uid inner join (select id
|
|
|
- from admin
|
|
|
- where id= #{aid,jdbcType=VARCHAR}
|
|
|
- or superior_id= #{aid,jdbcType=VARCHAR}
|
|
|
- ) y
|
|
|
+ on a.id=b.uid inner join (select id from admin a
|
|
|
+ inner join (select department_id as depId from admin where id= #{aid,jdbcType=VARCHAR} )b on a.department_id=b.depId) y
|
|
|
on y.id=a.information_maintainer
|
|
|
where 1=1 and a.status=0
|
|
|
<if test="type !=null and type!=''">
|