From 22c51a089e7ff07f2d9f61637c3edbce907ce7d5 Mon Sep 17 00:00:00 2001 From: zhaokai Date: Thu, 25 Jun 2026 15:48:07 +0800 Subject: [PATCH] =?UTF-8?q?refactor(config):=20=E6=9B=B4=E6=96=B0=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E6=96=87=E4=BB=B6=E5=92=8C=E7=94=A8=E6=88=B7=E9=97=A8?= =?UTF-8?q?=E9=9D=A2=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 0c8e1cf6e4fa915f8d983b5019772e4a7cb89dbe) # Conflicts: # web-adapter/src/main/java/com/zcloud/basic/info/facade/ZcloudUserFacadeImpl.java --- start/src/main/resources/bootstrap.yml | 8 ++++---- .../src/main/resources/mapper/sync/SyncUserMapper.xml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/start/src/main/resources/bootstrap.yml b/start/src/main/resources/bootstrap.yml index f467a2cb..ea7eb2ef 100644 --- a/start/src/main/resources/bootstrap.yml +++ b/start/src/main/resources/bootstrap.yml @@ -3,8 +3,8 @@ spring: import: # - classpath:nacos.yml # - classpath:sdk.yml - - classpath:nacos-prod.yml - - classpath:sdk-prod.yml -# - classpath:nacos-prod2.yml -# - classpath:sdk-prod2.yml +# - classpath:nacos-prod.yml +# - classpath:sdk-prod.yml + - classpath:nacos-prod2.yml + - classpath:sdk-prod2.yml - classpath:swagger.yml diff --git a/web-infrastructure/src/main/resources/mapper/sync/SyncUserMapper.xml b/web-infrastructure/src/main/resources/mapper/sync/SyncUserMapper.xml index 69c02e0c..79bc88bb 100644 --- a/web-infrastructure/src/main/resources/mapper/sync/SyncUserMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/sync/SyncUserMapper.xml @@ -35,7 +35,7 @@ left join department d on d.id = u.department_id left join post p on p.id = u.post_id - (and u.id != u.corpinfo_id + ( u.id != u.corpinfo_id and u.delete_enum = 'FALSE' and u.employment_flag in (1, 2) and u.corpinfo_id = #{params.corpinfoId}