diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml index ff6a748f..722f5ea0 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml @@ -3,7 +3,7 @@ @@ -31,7 +32,7 @@ FROM ( SELECT (@i:=@i+1) as rows, - sar_public_idea_all.id,sar_public_idea_all.reason,ts_institution.name as dept_name,sar_public_idea_all.old_text, + sar_public_idea_all.id,sar_public_idea_all.reason,concat(t2.name,'_',ts_institution.name) as dept_name,sar_public_idea_all.old_text, sar_public_idea_all.wk_flag,sar_public_idea_all.new_text,ts_user.INSTITUTION_ID as dept_id, sar_public_idea_all.part_code,sar_public_idea_all.user_name, sar_public_idea_all.user_id,sar_public_idea_all.content,sar_public_idea_all.idea_id,sar_public_idea_all.cid, @@ -39,6 +40,7 @@ FROM (sar_public_idea_all,(SELECT @i:=0)j) left join ts_user on sar_public_idea_all.user_id=ts_user.USID left join ts_institution on ts_institution.id=ts_user.INSTITUTION_ID + left join ts_institution t2 on ts_institution.parent_id=t2.id WHERE sar_public_idea_all.idea_id = #{ideaId} )c @@ -53,11 +55,12 @@