diff --git a/blade-auth/src/main/java/org/springblade/auth/AuthApplication.java b/blade-auth/src/main/java/org/springblade/auth/AuthApplication.java index 62627f3..614503b 100644 --- a/blade-auth/src/main/java/org/springblade/auth/AuthApplication.java +++ b/blade-auth/src/main/java/org/springblade/auth/AuthApplication.java @@ -38,7 +38,7 @@ import org.springframework.session.data.redis.config.annotation.web.http.EnableR */ @EnableRedisHttpSession @BladeCloudApplication -public class AuthApplication { +public class AuthApplication { public static void main(String[] args) { BladeApplication.run(AppConstant.APPLICATION_AUTH_NAME, AuthApplication.class, args); 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 c85fc84..97f4b3b 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 @@ -69,9 +69,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, @@ -86,7 +86,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' + LEFT JOIN blade_dept d ON dkti.dept_id = d.id AND d.is_deleted = '0' WHERE dkti.del_flag = '1'