From afa3bc1e2f39f66f59ee9b15d6af16593acdc9a4 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期六, 02 十二月 2023 10:38:27 +0800
Subject: [PATCH] #
---
src/main/resources/mapper/OrderMapper.xml | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/mapper/OrderMapper.xml b/src/main/resources/mapper/OrderMapper.xml
index c506b2b..1f8c3b4 100644
--- a/src/main/resources/mapper/OrderMapper.xml
+++ b/src/main/resources/mapper/OrderMapper.xml
@@ -29,6 +29,7 @@
<result column="memo" property="memo" />
<result column="transaction_rate" property="transactionRate" />
<result column="order_product_type_id" property="orderProductTypeId" />
+ <result column="memo_experience" property="memoExperience" />
</resultMap>
@@ -58,10 +59,10 @@
WHERE 1=1
<choose>
<when test="deptId != null and deptId != ''">
- AND (CHARINDEX(','+#{deptId}+',', ','+sd.path+',') > 0 OR sd.id = #{deptId})
+ AND ( (CHARINDEX(','+#{deptId}+',', ','+sd.path+',') > 0 OR sd.id = #{deptId})
or
(
- user_id = #{userId}
+ mo.user_id = #{userId}
or
mo.id in
(
@@ -71,13 +72,17 @@
where 1=1
and user_id = #{userId}
)
- )
+ ))
</when>
<otherwise>
and
(
- user_id = #{userId}
- or
+ <if test="userId != null and userId != ''">
+ mo.user_id = #{userId}
+ or
+ mo.director = #{userId}
+ or
+ </if>
mo.id in
(
select
@@ -103,6 +108,9 @@
or mo.addr like concat('%',#{condition},'%')
)
</if>
+ <if test="director != null and director != ''">
+ or mo.director = #{director}
+ </if>
ORDER BY mo.create_time DESC
</select>
--
Gitblit v1.9.1