From 65763d38cf9b6b8067a293d9c99297efea0de3e3 Mon Sep 17 00:00:00 2001
From: 928255095 <928255095@qq.com>
Date: 星期二, 07 九月 2021 22:04:15 +0800
Subject: [PATCH] Merge branch 'xinghong-dev' into 'master'
---
java110-db/src/main/resources/mapper/common/WorkflowServiceDaoImplMapper.xml | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/common/WorkflowServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/common/WorkflowServiceDaoImplMapper.xml
old mode 100644
new mode 100755
index c99855c..3c8bcf0
--- a/java110-db/src/main/resources/mapper/common/WorkflowServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/common/WorkflowServiceDaoImplMapper.xml
@@ -34,7 +34,7 @@
and t.b_id= #{bId}
</if>
<if test="communityId !=null and communityId != ''">
- and t.community_id= #{communityId}
+ and t.community_id in (#{communityId},'9999')
</if>
<if test="storeId !=null and storeId != ''">
and t.store_id= #{storeId}
@@ -70,7 +70,7 @@
and t.b_id= #{bId}
</if>
<if test="communityId !=null and communityId != ''">
- and t.community_id= #{communityId}
+ and t.community_id in (#{communityId},'9999')
</if>
<if test="storeId !=null and storeId != ''">
and t.store_id= #{storeId}
@@ -109,7 +109,7 @@
<if test="bId !=null and bId != ''">
and t.b_id= #{bId}
</if>
- <if test="communityId !=null and communityId != ''">
+ <if test="communityId !=null and communityId != '' and operationType==null ">
and t.community_id in (#{communityId},'9999')
</if>
<if test="storeId !=null and storeId != ''">
@@ -123,6 +123,12 @@
</if>
<if test="flowType !=null and flowType != ''">
and t.flow_type= #{flowType}
+ </if>
+ <if test="flowTypes !=null">
+ and t.flow_type in
+ <foreach collection="flowTypes" item="item" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
</if>
order by t.create_time desc
<if test="page != -1 and page != null ">
@@ -202,6 +208,13 @@
and t.flow_type= #{flowType}
</if>
+ <if test="flowTypes !=null">
+ and t.flow_type in
+ <foreach collection="flowTypes" item="item" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
+ </if>
+
</select>
--
Gitblit v1.8.0