From 08ff3d86f32498d1041d82746a3554563e051301 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 12 Mar 2021 13:53:16 +0800
Subject: [PATCH] 分销员后台8

---
 zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanApplyDao.xml |   28 +++++++++++++++++++++++++---
 1 files changed, 25 insertions(+), 3 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 d0d85cf..e0375f5 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanApplyDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanApplyDao.xml
@@ -58,13 +58,15 @@
 
 	<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
 		LEFT JOIN shop_salesman_grade g ON b.salesman_grade = g.id
 		<where>
-			and a.company_id=#{record.companyId}
+		 	a.company_id=#{record.companyId}
 			<if test="record.shenheState != null and record.shenheState != ''">
 				and a.apply_status=#{record.shenheState}
 			</if>
@@ -82,7 +84,7 @@
 		shop_salesman_apply a
 		LEFT JOIN biz_user b ON a.user_id = b.user_id
 		<where>
-			and a.company_id = #{record.companyId}
+			a.company_id = #{record.companyId}
 		    and a.apply_status = #{record.applyStatus}
 			<if test="record.nickName != null and record.nickName != ''">
 				and b.nick_name like concat('%',#{record.nickName},'%')
@@ -93,5 +95,25 @@
 			a.${record.sort} ${record.order}
 		</if>
 	</select>
+	<select id="selectBizUserApplyList" resultType="com.matrix.system.fenxiao.vo.ShopSalesmanAppliingVo">
+		SELECT
+		a.user_id userId,
+		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>
+		</where>
+		<if test="record.sort !=null">
+			order by
+			a.${record.sort} ${record.order}
+		</if>
+	</select>
 
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1