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}