代码提交

bonus-admin/src/main/resources/mapper/TransferProblemMapper.xml

@@ -59,7 +59,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		dkti.single_pro_name AS singleProName,
 		dkti.transfer_time AS transferTime,
 		dkti.dept_id AS deptId,
-		dkti.dept_name AS deptName,
+		( SELECT CASE
+		WHEN
+		d.ancestors IS NULL
+		OR d.ancestors = '' THEN
+		d.dept_name ELSE CONCAT(
+		(SELECT
+		GROUP_CONCAT(
+		dt.dept_name
+		ORDER BY
+		INSTR(
+		CONCAT( ',', d.ancestors, ',' ),
+		CONCAT( ',', dt.dept_id, ',' )) SEPARATOR ' / ')
+		FROM
+		da_ky_sys_dept dt
+		WHERE
+		FIND_IN_SET( dt.dept_id, d.ancestors )),
+		' / ',
+		d.dept_name)
+		END
+		) AS deptName,
 		dkti.transfer_issue AS transferIssue,
 		dkti.create_time AS createTime,
 		dkti.update_time AS updateTime,
@@ -71,6 +90,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		FROM
 			da_ky_transfer_issue dkti
 		left join da_ky_project dkp ON dkti.pro_id = dkp.id
+		LEFT JOIN da_ky_sys_dept d ON dkti.dept_id = d.dept_id AND d.del_flag = '0'
 		WHERE
 		dkti.del_flag = '1'
 		<if test="proName != null and proName != ''">