fix(database): 修复训练用户查询中部门名称缺失的问题
parent
27f9b9cbb3
commit
11ce45cecf
|
|
@ -30,3 +30,4 @@ replay_pid*
|
||||||
/web-client/target/
|
/web-client/target/
|
||||||
/web-adapter/target/
|
/web-adapter/target/
|
||||||
/start/target/
|
/start/target/
|
||||||
|
/start/src/main/resources/templates/
|
||||||
|
|
|
||||||
|
|
@ -1,10 +1,10 @@
|
||||||
spring:
|
spring:
|
||||||
config:
|
config:
|
||||||
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-prod.yml
|
# - classpath:nacos-prod.yml
|
||||||
# - classpath:sdk-prod2.yml
|
# - classpath:sdk-prod2.yml
|
||||||
- classpath:swagger.yml
|
- classpath:swagger.yml
|
||||||
|
|
|
||||||
|
|
@ -48,6 +48,7 @@
|
||||||
u.main_corp_flag,
|
u.main_corp_flag,
|
||||||
u.user_type,
|
u.user_type,
|
||||||
u.department_id,
|
u.department_id,
|
||||||
|
d.name as departmentName,
|
||||||
u.post_id,
|
u.post_id,
|
||||||
u.post_name,
|
u.post_name,
|
||||||
u.role_id,
|
u.role_id,
|
||||||
|
|
@ -92,6 +93,7 @@
|
||||||
from
|
from
|
||||||
user u
|
user u
|
||||||
left join training_user tu on tu.phone = u.username and tu.delete_enum = 'FALSE'
|
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
|
||||||
<where>
|
<where>
|
||||||
and u.delete_enum = 'FALSE'
|
and u.delete_enum = 'FALSE'
|
||||||
and tu.start_time < now()
|
and tu.start_time < now()
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue