zcloud_gbs
/
zcloud_gbs_basic_info_gwj
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor(config): 更新配置文件和用户门面实现 

(cherry picked from commit 0c8e1cf6e4)

# Conflicts:
#	web-adapter/src/main/java/com/zcloud/basic/info/facade/ZcloudUserFacadeImpl.java
dev_human_push
zhaokai 2026-06-25 15:48:07 +08:00
parent fde7cb5c2d
commit 22c51a089e
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
start/src/main/resources/bootstrap.yml
View File

@ -3,8 +3,8 @@ spring:
import: import:
# - classpath:nacos.yml # - classpath:nacos.yml
# - classpath:sdk.yml # - classpath:sdk.yml
- classpath:nacos-prod.yml # - classpath:nacos-prod.yml
- classpath:sdk-prod.yml # - classpath:sdk-prod.yml
# - classpath:nacos-prod2.yml - classpath:nacos-prod2.yml
# - classpath:sdk-prod2.yml - classpath:sdk-prod2.yml
- classpath:swagger.yml - classpath:swagger.yml

2
web-infrastructure/src/main/resources/mapper/sync/SyncUserMapper.xml
View File

@ -35,7 +35,7 @@
left join department d on d.id = u.department_id left join department d on d.id = u.department_id
left join post p on p.id = u.post_id left join post p on p.id = u.post_id
<where> <where>
(and u.id != u.corpinfo_id ( u.id != u.corpinfo_id
and u.delete_enum = 'FALSE' and u.delete_enum = 'FALSE'
and u.employment_flag in (1, 2) and u.employment_flag in (1, 2)
and u.corpinfo_id = #{params.corpinfoId} and u.corpinfo_id = #{params.corpinfoId}