|
|
@@ -454,9 +454,9 @@
|
|
|
CONCAT(i.first_contacts,' ', i.first_mobile) as firstContacts,
|
|
|
CONCAT(i.second_contacts,' ', i.second_mobile) as secondContacts,
|
|
|
CONCAT(i.third_contacts,' ', i.third_mobile) as thirdContacts
|
|
|
- from organization_identity i
|
|
|
- RIGHT JOIN user u on u.id = i.uid
|
|
|
- LEFT JOIN admin a on a.id = i.consultant
|
|
|
+ from user u
|
|
|
+ LEFT JOIN organization_identity i on u.id = i.uid
|
|
|
+ LEFT JOIN admin a on a.id = u.aid
|
|
|
where u.type = 1 and u.lvl = 1
|
|
|
<if test="unitName != null">
|
|
|
and i.unit_name like CONCAT('%', #{unitName,jdbcType=VARCHAR}, '%')
|
|
|
@@ -474,9 +474,9 @@
|
|
|
|
|
|
<select id="findCultivationCount" resultType="java.lang.Integer" parameterType="java.lang.String">
|
|
|
select count(1)
|
|
|
- from organization_identity i
|
|
|
- RIGHT JOIN user u on u.id = i.uid
|
|
|
- LEFT JOIN admin a on a.id = i.consultant
|
|
|
+ from user u
|
|
|
+ LEFT JOIN organization_identity i on u.id = i.uid
|
|
|
+ LEFT JOIN admin a on a.id = u.aid
|
|
|
where u.type = 1 and u.lvl = 1
|
|
|
<if test="unitName != null">
|
|
|
and i.unit_name = #{unitName,jdbcType=VARCHAR}
|