From 02b99a09475f5b4497a7864635d196a301d4ba71 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sun, 27 Dec 2020 13:37:50 +0800
Subject: [PATCH] modify

---
 zq-erp/src/main/resources/mybatis/mapper/hive/SysProjServicesDao.xml |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjServicesDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjServicesDao.xml
index 57fe46a..ebbc391 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjServicesDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjServicesDao.xml
@@ -469,6 +469,7 @@
 		<collection property="projs" ofType="com.matrix.system.app.vo.ServiceOrderListProjVo">
 			<result property="projName" column="projName" />
 			<result property="beautyName" column="beautyName" />
+			<result property="id" column="staffId" />
 		</collection>
 	</resultMap>
 
@@ -482,6 +483,7 @@
 		   a.state status,
 		   d.BED_NAME bed,
 		   e.VIP_NAME vipName,
+		   b.staff_id staffId,
 		   f.su_name beautyName,
 		   g.proj_name projName
 		from sys_proj_services a
@@ -500,6 +502,9 @@
 			</if>
 			<if test="record.shopId != null">
 				and a.shop_id=#{record.shopId}
+			</if>
+			<if test="record.userId!=null">
+				and (a.create_staff_id=#{record.userId} or b.staff_id=#{record.userId})
 			</if>
 		</where>
 		<if test="pageVo !=null"><!-- 判断pageVo对象是否为空 -->
@@ -530,6 +535,9 @@
 			<if test="record.shopId != null">
 				and a.shop_id=#{record.shopId}
 			</if>
+			<if test="record.userId!=null">
+				and (a.create_staff_id=#{record.userId} or b.staff_id=#{record.userId})
+			</if>
 		</where>
 	</select>
 </mapper>

--
Gitblit v1.9.1