From ad4c12307f622abffd86a7fe3f713b82c668d0e0 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 28 Dec 2020 10:36:01 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/resources/mybatis/mapper/hive/SysProjServicesDao.xml | 10 ++++++++++
1 files changed, 10 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..d2b2a8b 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjServicesDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjServicesDao.xml
@@ -466,9 +466,11 @@
<result property="vipName" column="vipName" />
<result property="timeLength" column="timeLength" />
<result property="status" column="status" />
+ <result property="createStaffId" column="createStaffId" />
<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>
@@ -480,8 +482,10 @@
a.YY_TIME time,
a.TOTAL_TIME timeLength,
a.state status,
+ a.create_staff_id createStaffId,
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 +504,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 +537,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