From ff517178453b21a9bb084c1ed39def9f7e4f45f3 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 12 Mar 2021 13:53:23 +0800
Subject: [PATCH] Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop
---
zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanApplyDao.xml | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanApplyDao.xml b/zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanApplyDao.xml
index 89ef382..a4703dd 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanApplyDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanApplyDao.xml
@@ -60,7 +60,9 @@
<select id="findShopSalesmanApplyList" resultType="com.matrix.system.fenxiao.vo.ShopSalesmanApplyVo">
SELECT
- a.user_id userId
+ a.user_id userId,
+ b.nick_name nickname,
+ (SELECT s.nick_name from biz_user s where s.user_id = a.parent_user_id) parentUser,
FROM
shop_salesman_apply a
LEFT JOIN biz_user b ON a.user_id = b.user_id
@@ -101,9 +103,11 @@
a.nick_name nickName
FROM
biz_user a
+ LEFT JOIN shop_salesman_apply b ON a.user_id = b.user_id
<where>
a.company_id = #{record.companyId}
and a.is_sales != 1
+ and b.apply_status != 1
<if test="record.nickName != null and record.nickName != ''">
and a.nick_name like concat('%',#{record.nickName},'%')
</if>
--
Gitblit v1.9.1