|
|
@@ -244,10 +244,11 @@
|
|
|
do.intention_money as intentionMoney, do.contract_money as contractMoney, do.commission,
|
|
|
do.service_money as serviceMoney, d.name, d.serial_number as demandSerialNumber,
|
|
|
d.deleted_sign as deletedSign, d.audit_status as auditStatus,
|
|
|
- do.uid, ui.nickname as username
|
|
|
+ do.uid, ui.username, oi.unit_name as unitName
|
|
|
from demand_order do
|
|
|
left join demand d on d.id = do.demand_id
|
|
|
- left join user ui on ui.id = do.uid
|
|
|
+ left join user_identity ui on ui.uid = do.uid
|
|
|
+ left join organization_identity oi on oi.uid = do.uid
|
|
|
where do.deleted_sign = 0
|
|
|
and d.deleted_sign = 0
|
|
|
and d.data_category = 0
|
|
|
@@ -261,7 +262,8 @@
|
|
|
and d.uid = #{uid,jdbcType=VARCHAR}
|
|
|
</if>
|
|
|
<if test="username != null">
|
|
|
- and ui.nickname = #{username,jdbcType=VARCHAR}
|
|
|
+ and (oi.unit_name = #{username,jdbcType=VARCHAR}
|
|
|
+ or ui.username = #{username,jdbcType=VARCHAR})
|
|
|
</if>
|
|
|
order by do.serial_number desc
|
|
|
<if test="page_sql!=null">
|
|
|
@@ -274,7 +276,8 @@
|
|
|
count(1)
|
|
|
from demand_order do
|
|
|
left join demand d on d.id = do.demand_id
|
|
|
- left join user ui on ui.id = do.uid
|
|
|
+ left join user_identity ui on ui.uid = do.uid
|
|
|
+ left join organization_identity oi on oi.uid = do.uid
|
|
|
where do.deleted_sign = 0
|
|
|
and d.deleted_sign = 0
|
|
|
and d.data_category = 0
|
|
|
@@ -288,7 +291,8 @@
|
|
|
and d.uid = #{uid,jdbcType=VARCHAR}
|
|
|
</if>
|
|
|
<if test="username != null">
|
|
|
- and ui.nickname = #{username,jdbcType=VARCHAR}
|
|
|
+ and (oi.unit_name = #{username,jdbcType=VARCHAR}
|
|
|
+ or ui.username = #{username,jdbcType=VARCHAR})
|
|
|
</if>
|
|
|
</select>
|
|
|
|
|
|
@@ -300,10 +304,11 @@
|
|
|
do.intention_money as intentionMoney, do.contract_money as contractMoney, do.commission,
|
|
|
do.service_money as serviceMoney, d.name, d.serial_number as demandSerialNumber,
|
|
|
d.deleted_sign as deletedSign, d.audit_status as auditStatus,
|
|
|
- do.uid, oi.nickname as unitName
|
|
|
+ do.uid, oi.unit_name as unitName, ui.username
|
|
|
from demand_order do
|
|
|
left join demand d on d.id = do.demand_id
|
|
|
- left join user oi on u.id = do.uid
|
|
|
+ left join organization_identity oi on oi.uid = do.uid
|
|
|
+ left join user_identity ui on ui.uid = do.uid
|
|
|
where do.deleted_sign = 0
|
|
|
and d.deleted_sign = 0
|
|
|
and d.data_category = 1
|
|
|
@@ -317,7 +322,8 @@
|
|
|
and d.uid = #{uid,jdbcType=VARCHAR}
|
|
|
</if>
|
|
|
<if test="unitName != null">
|
|
|
- and oi.nickname = #{unitName,jdbcType=VARCHAR}
|
|
|
+ and (oi.unit_name = #{unitName,jdbcType=VARCHAR}
|
|
|
+ or ui.username = #{unitName,jdbcType=VARCHAR})
|
|
|
</if>
|
|
|
order by do.serial_number desc
|
|
|
<if test="page_sql!=null">
|
|
|
@@ -330,7 +336,8 @@
|
|
|
count(1)
|
|
|
from demand_order do
|
|
|
left join demand d on d.id = do.demand_id
|
|
|
- left join user oi on oi.id = do.uid
|
|
|
+ left join organization_identity oi on oi.uid = do.uid
|
|
|
+ left join user_identity ui on ui.uid = do.uid
|
|
|
where do.deleted_sign = 0
|
|
|
and d.deleted_sign = 0
|
|
|
and d.data_category = 1
|
|
|
@@ -344,10 +351,9 @@
|
|
|
and d.uid = #{uid,jdbcType=VARCHAR}
|
|
|
</if>
|
|
|
<if test="unitName != null">
|
|
|
- and oi.nickname = #{unitName,jdbcType=VARCHAR}
|
|
|
+ and (oi.unit_name = #{unitName,jdbcType=VARCHAR}
|
|
|
+ or ui.username = #{unitName,jdbcType=VARCHAR})
|
|
|
</if>
|
|
|
</select>
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
</mapper>
|