From 0f66a8dc0544e72b0d41adfc69db20ea584c4661 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Wed, 17 Mar 2021 18:26:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop

---
 zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanApplyDao.xml |    2 ++
 1 files changed, 2 insertions(+), 0 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 f7c6e7b..aaeab95 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanApplyDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanApplyDao.xml
@@ -66,6 +66,7 @@
 		b.nick_name nickname,
 		(SELECT s.nick_name FROM biz_user s
 		WHERE s.open_id = a.parent_user_id ) parentUser,
+		c.nick_name parentUserNow,
 		( SELECT COUNT(*) FROM biz_user
 		WHERE parent_open_id = a.user_id AND is_sales != 1 ) lowerLevelNum,
 		( SELECT COUNT(*) FROM biz_user
@@ -82,6 +83,7 @@
 		shop_salesman_apply a
 		LEFT JOIN biz_user b ON a.user_id = b.open_id
 		LEFT JOIN shop_salesman_grade g ON a.grade_id = g.id
+		LEFT JOIN biz_user c ON c.open_id = b.parent_open_id
 		<where>
 		 	a.company_id=#{record.companyId}
 			<if test="record.shenheState != null and record.shenheState != ''">

--
Gitblit v1.9.1