|
|
@@ -27,10 +27,12 @@
|
|
|
`iio`.`order_status` as `order_status`,
|
|
|
`iio`.`create_time` as `create_time`,
|
|
|
`iit`.`name` AS `template_name`,
|
|
|
- `iu`.`display_name` AS `current_user_name`
|
|
|
+ `iu1`.`display_name` AS `current_user_name`,
|
|
|
+ `iu2`.`display_name` AS `user_name`
|
|
|
from `it_itsm_order` iio
|
|
|
LEFT JOIN `it_itsm_template` `iit` ON `iio`.`template_id` = `iit`.`template_id`
|
|
|
- LEFT JOIN `it_user` `iu` ON `iio`.`current_user_id` = `iu`.`user_id`
|
|
|
+ LEFT JOIN `it_user` `iu1` ON `iio`.`current_user_id` = `iu1`.`user_id`
|
|
|
+ LEFT JOIN `it_user` `iu2` ON `iio`.`user_id` = `iu2`.`user_id`
|
|
|
where
|
|
|
<if test="processed">
|
|
|
`processed_user` = #{userId}
|
|
|
@@ -55,10 +57,12 @@
|
|
|
`iio`.`comment` as `comment`,
|
|
|
`iio`.`create_time` as `create_time`,
|
|
|
`iit`.`name` AS `template_name`,
|
|
|
- `iu`.`display_name` AS `current_user_name`
|
|
|
+ `iu1`.`display_name` AS `current_user_name`,
|
|
|
+ `iu2`.`display_name` AS `user_name`
|
|
|
from `it_itsm_order` iio
|
|
|
LEFT JOIN `it_itsm_template` `iit` ON `iio`.`template_id` = `iit`.`template_id`
|
|
|
- LEFT JOIN `it_user` `iu` ON `iio`.`current_user_id` = `iu`.`user_id`
|
|
|
+ LEFT JOIN `it_user` `iu1` ON `iio`.`current_user_id` = `iu1`.`user_id`
|
|
|
+ LEFT JOIN `it_user` `iu2` ON `iio`.`user_id` = `iu2`.`user_id`
|
|
|
where (`iio`.`order_id` = #{orderId} AND
|
|
|
(iio.`user_id` = #{userId} OR iio.`current_user_id` = #{userId} OR
|
|
|
iio.`order_id` IN
|
|
|
@@ -75,10 +79,12 @@
|
|
|
`iio`.`order_status` as `order_status`,
|
|
|
`iio`.`create_time` as `create_time`,
|
|
|
`iit`.`name` AS `template_name`,
|
|
|
- `iu`.`display_name` AS `current_user_name`
|
|
|
+ `iu1`.`display_name` AS `current_user_name`,
|
|
|
+ `iu2`.`display_name` AS `user_name`
|
|
|
from `it_itsm_order` iio
|
|
|
LEFT JOIN `it_itsm_template` `iit` ON `iio`.`template_id` = `iit`.`template_id`
|
|
|
- LEFT JOIN `it_user` `iu` ON `iio`.`current_user_id` = `iu`.`user_id`
|
|
|
+ LEFT JOIN `it_user` `iu1` ON `iio`.`current_user_id` = `iu1`.`user_id`
|
|
|
+ LEFT JOIN `it_user` `iu2` ON `iio`.`user_id` = `iu2`.`user_id`
|
|
|
where `iio`.`user_id` = #{userId}
|
|
|
and `iio`.`order_status` = #{orderStatus}
|
|
|
order by `create_time` desc
|