FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 内外部会议查询报错问题

Browse Source
This commit is contained in:
wxyclub
2023-11-28 19:17:34 +08:00
parent c3c8771118
commit 2740d50b9c
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/resources/mybatis/mapper/InsideOntSideMeeting/InsideOntSideMeeting.xml
+3 -3
View File
@@ -10,7 +10,7 @@
<result column="MEETING_ORGANIZER" property="meetingOrganizer" /> <result column="MEETING_ORGANIZER" property="meetingOrganizer" />
<result column="MEETING_TIME" property="meetingTime" /> <result column="MEETING_TIME" property="meetingTime" />
<result column="MEETING_ADDRESS" property="meetingAddress" /> <result column="MEETING_ADDRESS" property="meetingAddress" />
<result column="agendaNameStr" property="agendaNameStr" /> <result column="AGENDA_NAME_STR" property="agendaNameStr" />
<result column="PARTICIPANTS" property="participants" /> <result column="PARTICIPANTS" property="participants" />
<result column="MEETING_MINUTES" property="meetingMinutes" /> <result column="MEETING_MINUTES" property="meetingMinutes" />
<result column="MEETING_CONTENT" property="meetingContent" /> <result column="MEETING_CONTENT" property="meetingContent" />
@@ -41,7 +41,7 @@
mt.ID as mtId,mt.MEETING_ID,mt.AGENDA_NAME,mt.AGENDA_MATERIALS,mt.REPORTER,mt.REPORTING_UNIT, mt.ID as mtId,mt.MEETING_ID,mt.AGENDA_NAME,mt.AGENDA_MATERIALS,mt.REPORTER,mt.REPORTING_UNIT,
mt.AGENDA_CONTENT, mt.AGENDA_CONTENT,
iom.VALID_FLAG,iom.CREATE_TIME,iom.MODIFY_TIME, iom.VALID_FLAG,iom.CREATE_TIME,iom.MODIFY_TIME,
iom.agendaNameStr iom.AGENDA_NAME_STR
</sql> </sql>
<sql id="Base_Where_Clause"> <sql id="Base_Where_Clause">
<trim suffixOverrides="," > <trim suffixOverrides="," >
@@ -108,7 +108,7 @@
select <include refid="Base_Column_Join_MeetingTopic_List" /> select <include refid="Base_Column_Join_MeetingTopic_List" />
from (select <include refid="Base_Column_List" />,( from (select <include refid="Base_Column_List" />,(
select GROUP_CONCAT(AGENDA_NAME SEPARATOR ',') from meeting_topic where inside_outside_meeting.ID = meeting_topic.MEETING_ID select GROUP_CONCAT(AGENDA_NAME SEPARATOR ',') from meeting_topic where inside_outside_meeting.ID = meeting_topic.MEETING_ID
) as agendaNameStr from inside_outside_meeting where VALID_FLAG = 0 <include refid="Base_Where_Clause"/> ) as AGENDA_NAME_STR from inside_outside_meeting where VALID_FLAG = 0 <include refid="Base_Where_Clause"/>
<if test="sortField != 'AGENDA_NAME'"> <if test="sortField != 'AGENDA_NAME'">
order by ${sortField} ${sortMode} order by ${sortField} ${sortMode}
</if> </if>