diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/TransferApplyMapper.xml b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/TransferApplyMapper.xml index 53f8e84..3f309c1 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/TransferApplyMapper.xml +++ b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/TransferApplyMapper.xml @@ -341,9 +341,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" SELECT GROUP_CONCAT( dt.dept_name SEPARATOR ' / ' ) FROM - da_ky_sys_dept dt + blade_dept dt WHERE - FIND_IN_SET( dt.dept_id, d.ancestors )), + FIND_IN_SET( dt.id, d.ancestors )), ' / ', d.dept_name ))) AS deptName, @@ -363,7 +363,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" dkta.del_flag AS delFlag FROM da_ky_transfer_apply dkta left join da_ky_project dkp on dkta.pro_id = dkp.id - LEFT JOIN da_ky_sys_dept d ON dkta.dept_id = d.dept_id AND d.del_flag = '0' + LEFT JOIN blade_dept d ON dkta.dept_id = d.id AND d.is_deleted = '0' where dkta.del_flag = '1' and dkta.create_user_id = #{userId} @@ -397,24 +397,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/TransferProblemMapper.xml b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/TransferProblemMapper.xml index 97f4b3b..6f1995b 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/TransferProblemMapper.xml +++ b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/TransferProblemMapper.xml @@ -89,8 +89,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" LEFT JOIN blade_dept d ON dkti.dept_id = d.id AND d.is_deleted = '0' WHERE dkti.del_flag = '1' - - AND dkti.single_pro_name = #{proName} + + AND dkti.single_pro_name like concat('%', #{singleProName}, '%') and dkp.pro_type = #{proType}