From 11ce45cecf414d9fbdfa2b348b4b7a2157bd37ed Mon Sep 17 00:00:00 2001 From: zhaokai Date: Wed, 27 May 2026 15:58:47 +0800 Subject: [PATCH] =?UTF-8?q?fix(database):=20=E4=BF=AE=E5=A4=8D=E8=AE=AD?= =?UTF-8?q?=E7=BB=83=E7=94=A8=E6=88=B7=E6=9F=A5=E8=AF=A2=E4=B8=AD=E9=83=A8?= =?UTF-8?q?=E9=97=A8=E5=90=8D=E7=A7=B0=E7=BC=BA=E5=A4=B1=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + start/src/main/resources/bootstrap.yml | 8 ++++---- .../src/main/resources/mapper/TrainingUserMapper.xml | 2 ++ 3 files changed, 7 insertions(+), 4 deletions(-) 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()