|
|
@@ -1088,7 +1088,7 @@
|
|
|
from
|
|
|
user_business a inner join user b on
|
|
|
a.uid = b.id left join business_glossory c on
|
|
|
- a.business_glossory_id = c.id left join admin d on
|
|
|
+ a.business_project_id = c.id left join admin d on
|
|
|
a.aid = d.id
|
|
|
where 1 = 1
|
|
|
<if test="aid != null and aid != ''">
|
|
|
@@ -1133,9 +1133,9 @@
|
|
|
from
|
|
|
user_business a inner join user b on
|
|
|
a.uid = b.id left join business_glossory c on
|
|
|
- a.business_glossory_id = c.id left join admin d on
|
|
|
+ a.business_project_id = c.id left join admin d on
|
|
|
a.aid = d.id
|
|
|
- LEFT JOIN department_management dm on dm.id = d.department_id
|
|
|
+ left join department_management dm on dm.id = d.department_id
|
|
|
where 1 = 1
|
|
|
<if test="aid != null and aid != ''">
|
|
|
and (b.aid = #{aid,jdbcType=VARCHAR} or d.department_id=(select department_id from admin where id=#{aid,jdbcType=VARCHAR}))
|
|
|
@@ -1143,8 +1143,8 @@
|
|
|
<if test="uid != null and uid !=''">
|
|
|
and a.uid = #{uid,jdbcType=VARCHAR}
|
|
|
</if>
|
|
|
- <if test="businessGlossoryId !=null and businessGlossoryId != ''">
|
|
|
- and a.business_glossory_id = #{businessGlossoryId,jdbcType=VARCHAR}
|
|
|
+ <if test="businessProjectId !=null and businessProjectId != ''">
|
|
|
+ and a.business_project_id = #{businessProjectId,jdbcType=VARCHAR}
|
|
|
</if>
|
|
|
<if test="identifyName != null and identifyName != ''">
|
|
|
and b.identify_name like concat('%', #{identifyName},'%')
|
|
|
@@ -1176,9 +1176,9 @@
|
|
|
from
|
|
|
user_business a inner join user b on
|
|
|
a.uid = b.id left join business_glossory c on
|
|
|
- a.business_glossory_id = c.id left join admin d on
|
|
|
+ a.business_project_id = c.id left join admin d on
|
|
|
a.aid = d.id
|
|
|
- LEFT JOIN department_management dm on dm.id = d.department_id
|
|
|
+ left join department_management dm on dm.id = d.department_id
|
|
|
where 1 = 1
|
|
|
<if test="aid != null and aid != ''">
|
|
|
and (b.aid = #{aid,jdbcType=VARCHAR} or d.department_id=(select department_id from admin where id=#{aid,jdbcType=VARCHAR}))
|
|
|
@@ -1186,8 +1186,8 @@
|
|
|
<if test="uid != null and uid !=''">
|
|
|
and a.uid = #{uid,jdbcType=VARCHAR}
|
|
|
</if>
|
|
|
- <if test="businessGlossoryId !=null and businessGlossoryId != ''">
|
|
|
- and a.business_glossory_id = #{businessGlossoryId,jdbcType=VARCHAR}
|
|
|
+ <if test="businessProjectId !=null and businessProjectId != ''">
|
|
|
+ and a.business_project_id = #{businessProjectId,jdbcType=VARCHAR}
|
|
|
</if>
|
|
|
<if test="identifyName != null and identifyName != ''">
|
|
|
and b.identify_name like concat('%', #{identifyName},'%')
|