fix:bug
This commit is contained in:
+2
-2
@@ -93,7 +93,6 @@
|
|||||||
${ew.customSqlSegment}
|
${ew.customSqlSegment}
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
|
|
||||||
<select id="chooseExcel" resultType="com.jero.data.entity.ChooseExcelWorkingGroup">
|
<select id="chooseExcel" resultType="com.jero.data.entity.ChooseExcelWorkingGroup">
|
||||||
SELECT pt.name as peopleName,if(pcm.status=1,pcm.company_name,CONCAT(pcm.company_name,'(待审核)')) as companyName,pt.post as post,pt.phone as phone ,pe.name as name
|
SELECT pt.name as peopleName,if(pcm.status=1,pcm.company_name,CONCAT(pcm.company_name,'(待审核)')) as companyName,pt.post as post,pt.phone as phone ,pe.name as name
|
||||||
from
|
from
|
||||||
@@ -126,12 +125,13 @@
|
|||||||
</collection>
|
</collection>
|
||||||
</resultMap>
|
</resultMap>
|
||||||
<select id="listThreeTwo" resultMap="peopleTwo">
|
<select id="listThreeTwo" resultMap="peopleTwo">
|
||||||
SELECT pe.id as id,pe.name as name,pe.abbreviation,pe.remarks,pe.create_by as principal
|
SELECT pe.id as id,pe.name as name,pe.abbreviation,pe.remarks,su.realname as principal
|
||||||
from
|
from
|
||||||
pay_case_committee pe
|
pay_case_committee pe
|
||||||
left JOIN pay_case_committee_subitem pm on (pe.id = pm.committee_id)
|
left JOIN pay_case_committee_subitem pm on (pe.id = pm.committee_id)
|
||||||
left JOIN pay_contacts_management pt on (pm.contacts_id = pt.id)
|
left JOIN pay_contacts_management pt on (pm.contacts_id = pt.id)
|
||||||
left join pay_company_management pcm on(pm.company_id=pcm.id)
|
left join pay_company_management pcm on(pm.company_id=pcm.id)
|
||||||
|
left join sys_user su on(pe.create_by_id=su.id)
|
||||||
<where>
|
<where>
|
||||||
<if test="fenBiaoWeiName!=null and fenBiaoWeiName != ''">
|
<if test="fenBiaoWeiName!=null and fenBiaoWeiName != ''">
|
||||||
AND pe.name LIKE CONCAT('%',#{fenBiaoWeiName},'%')
|
AND pe.name LIKE CONCAT('%',#{fenBiaoWeiName},'%')
|
||||||
|
|||||||
+2
-1
@@ -116,12 +116,13 @@
|
|||||||
</collection>
|
</collection>
|
||||||
</resultMap>
|
</resultMap>
|
||||||
<select id="listThreeTwo" resultMap="peopleTwo">
|
<select id="listThreeTwo" resultMap="peopleTwo">
|
||||||
SELECT pe.id as id,pe.name as name,pe.remarks,pe.create_by as principal
|
SELECT pe.id as id,pe.name as name,pe.remarks,su.realname as principal
|
||||||
from
|
from
|
||||||
pay_case_council pe
|
pay_case_council pe
|
||||||
left JOIN pay_case_council_subitem pm on (pe.id = pm.council_id)
|
left JOIN pay_case_council_subitem pm on (pe.id = pm.council_id)
|
||||||
left JOIN pay_contacts_management pt on (pm.contacts_id = pt.id)
|
left JOIN pay_contacts_management pt on (pm.contacts_id = pt.id)
|
||||||
left join pay_company_management pcm on(pm.company_id=pcm.id)
|
left join pay_company_management pcm on(pm.company_id=pcm.id)
|
||||||
|
left join sys_user su on(pe.create_by_id=su.id)
|
||||||
<where>
|
<where>
|
||||||
<if test=" councilNames!=null and councilNames != ''">
|
<if test=" councilNames!=null and councilNames != ''">
|
||||||
AND pe.name LIKE CONCAT('%',#{councilNames},'%')
|
AND pe.name LIKE CONCAT('%',#{councilNames},'%')
|
||||||
|
|||||||
Reference in New Issue
Block a user