refactor(config): 更新配置文件和用户门面实现
(cherry picked from commit 0c8e1cf6e4)
# Conflicts:
# web-adapter/src/main/java/com/zcloud/basic/info/facade/ZcloudUserFacadeImpl.java
dev_human_push
parent
fde7cb5c2d
commit
22c51a089e
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@
|
|||
left join department d on d.id = u.department_id
|
||||
left join post p on p.id = u.post_id
|
||||
<where>
|
||||
(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}
|
||||
|
|
|
|||
Loading…
Reference in New Issue