|
@@ -39,6 +39,7 @@ SELECT concat(
|
|
|
id,
|
|
|
depart_name,
|
|
|
leader_id,
|
|
|
+ leader_name,
|
|
|
count(DISTINCT signature) num,
|
|
|
count(distinct innovate_code) innovate_num,
|
|
|
sum(cost) cost,
|
|
@@ -423,6 +424,7 @@ FROM (
|
|
|
uc.company_name
|
|
|
END company_name,
|
|
|
cma.leader_id,
|
|
|
+ us.realname as leader_name,
|
|
|
ur.org_type,
|
|
|
ur.org_code,
|
|
|
ur.id,
|
|
@@ -638,6 +640,7 @@ FROM (
|
|
|
LEFT JOIN `jeecg-boot`.user_company uc ON cma.leader_id = uc.user_id
|
|
|
LEFT JOIN `jeecg-boot`.sys_user_depart de ON cma.leader_id = de.user_id
|
|
|
LEFT JOIN `jeecg-boot`.sys_depart ur ON de.dep_id = ur.id
|
|
|
+ LEFT JOIN `jeecg-boot`.sys_user us on us.id =cma.leader_id
|
|
|
WHERE image_mode IN (
|
|
|
'CREATIVE_IMAGE_MODE_VIDEO',
|
|
|
'CREATIVE_IMAGE_MODE_VIDEO_VERTICAL',
|