|  | @@ -231,6 +231,7 @@
 | 
												
													
														
															|  |          <include refid="Base_Column_List"></include>,
 |  |          <include refid="Base_Column_List"></include>,
 | 
												
													
														
															|  |          su.name as operator,
 |  |          su.name as operator,
 | 
												
													
														
															|  |          so.name as operator_office,
 |  |          so.name as operator_office,
 | 
												
													
														
															|  | 
 |  | +        d.ID_ AS task_id,
 | 
												
													
														
															|  |          (select
 |  |          (select
 | 
												
													
														
															|  |          CASE
 |  |          CASE
 | 
												
													
														
															|  |          WHEN RIGHT( GROUP_CONCAT(case when program_id is null then 2 else 1 end),1) =2 THEN GROUP_CONCAT(concat('其他:',wipr1.program_name))
 |  |          WHEN RIGHT( GROUP_CONCAT(case when program_id is null then 2 else 1 end),1) =2 THEN GROUP_CONCAT(concat('其他:',wipr1.program_name))
 | 
												
											
												
													
														
															|  | @@ -246,6 +247,7 @@
 | 
												
													
														
															|  |          left join sys_user su on fi.create_by_id = su.id and su.del_flag = '0'
 |  |          left join sys_user su on fi.create_by_id = su.id and su.del_flag = '0'
 | 
												
													
														
															|  |          left join sys_user_manage_office sumo on sumo.office_id = su.office_id
 |  |          left join sys_user_manage_office sumo on sumo.office_id = su.office_id
 | 
												
													
														
															|  |          left join sys_office so on su.office_id = so.id and so.del_flag = '0'
 |  |          left join sys_office so on su.office_id = so.id and so.del_flag = '0'
 | 
												
													
														
															|  | 
 |  | +        LEFT JOIN act_ru_task d ON fi.proc_ins_id = d.PROC_INST_ID_
 | 
												
													
														
															|  |          ${ew.customSqlSegment}
 |  |          ${ew.customSqlSegment}
 | 
												
													
														
															|  |          ORDER BY
 |  |          ORDER BY
 | 
												
													
														
															|  |          fi.create_time DESC, cfid.number asc
 |  |          fi.create_time DESC, cfid.number asc
 |