|
|
@@ -232,10 +232,11 @@
|
|
|
ao.intention_money as intentionMoney, ao.contract_money as contractMoney, ao.commission,
|
|
|
ao.service_money as serviceMoney, a.name, a.serial_number as achievementSerialNumber,
|
|
|
a.deleted_sign as deletedSign, a.audit_status as auditStatus, ui.username,
|
|
|
- ao.uid
|
|
|
+ ao.uid, oi.unit_name as unitName
|
|
|
from achievement_order ao
|
|
|
left join achievement a on a.id = ao.achievement_id
|
|
|
left join user_identity ui on ui.uid = ao.uid
|
|
|
+ left join organization_identity oi on oi.uid = ao.uid
|
|
|
where ao.deleted_sign = 0
|
|
|
and a.deleted_sign = 0
|
|
|
and a.owner_type= 0
|
|
|
@@ -288,9 +289,10 @@
|
|
|
ao.intention_money as intentionMoney, ao.contract_money as contractMoney, ao.commission,
|
|
|
ao.service_money as serviceMoney, a.name, a.serial_number as achievementSerialNumber,
|
|
|
a.deleted_sign as deletedSign, a.audit_status as auditStatus, ao.uid,
|
|
|
- oi.unit_name as unitName
|
|
|
+ oi.unit_name as unitName, ui.username
|
|
|
from achievement_order ao
|
|
|
left join achievement a on a.id = ao.achievement_id
|
|
|
+ left join user_identity ui on ui.uid = ao.uid
|
|
|
left join organization_identity oi on oi.uid = ao.uid
|
|
|
where ao.deleted_sign = 0
|
|
|
and a.deleted_sign = 0
|