diff --git a/.gitignore b/.gitignore index 2de53c2..2d0d164 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,4 @@ replay_pid* /web-client/target/ /web-adapter/target/ /start/target/ +/start/src/main/resources/templates/ diff --git a/start/src/main/resources/bootstrap.yml b/start/src/main/resources/bootstrap.yml index acea536..77138f9 100644 --- a/start/src/main/resources/bootstrap.yml +++ b/start/src/main/resources/bootstrap.yml @@ -1,10 +1,10 @@ spring: config: import: - - classpath:nacos.yml - - classpath:sdk.yml -# - classpath:nacos-prod.yml -# - classpath:sdk-prod.yml +# - classpath:nacos.yml +# - classpath:sdk.yml + - classpath:nacos-prod.yml + - classpath:sdk-prod.yml # - classpath:nacos-prod.yml # - classpath:sdk-prod2.yml - classpath:swagger.yml diff --git a/web-infrastructure/src/main/resources/mapper/TrainingUserMapper.xml b/web-infrastructure/src/main/resources/mapper/TrainingUserMapper.xml index e13adf1..6459041 100644 --- a/web-infrastructure/src/main/resources/mapper/TrainingUserMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/TrainingUserMapper.xml @@ -48,6 +48,7 @@ u.main_corp_flag, u.user_type, u.department_id, + d.name as departmentName, u.post_id, u.post_name, u.role_id, @@ -92,6 +93,7 @@ from user u left join training_user tu on tu.phone = u.username and tu.delete_enum = 'FALSE' + left join department d on d.id = u.department_id and u.delete_enum = 'FALSE' and tu.start_time < now()