From 3fc3fcf19503465facc2631d495bd497e4266128 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 11 Mar 2021 21:46:36 +0800
Subject: [PATCH] 分销员后台3

---
 zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanApplyDao.xml |   28 ++++++++++++++--------------
 1 files changed, 14 insertions(+), 14 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 a621ad6..d0d85cf 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanApplyDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanApplyDao.xml
@@ -58,7 +58,7 @@
 
 	<select id="findShopSalesmanApplyList" resultType="com.matrix.system.fenxiao.vo.ShopSalesmanApplyVo">
 		SELECT
-		b.nick_name
+		a.user_id userId
 		FROM
 		shop_salesman_apply a
 		LEFT JOIN biz_user b ON a.user_id = b.user_id
@@ -66,32 +66,32 @@
 		<where>
 			and a.company_id=#{record.companyId}
 			<if test="record.shenheState != null and record.shenheState != ''">
-				and a.apply_status=#{shenheState}
+				and a.apply_status=#{record.shenheState}
 			</if>
 		</where>
 		<if test="record.sort !=null">
 			order by
 			a.${record.sort} ${record.order}
 		</if>
-		<if test="record.offset >=0  and record.limit >0">
-			limit
-			#{record.offset},#{record.limit}
-		</if>
 	</select>
-
-	<select id="findShopSalesmanApplyListTotal" resultType="java.lang.Integer">
-		SELECT count(*)
+	<select id="findShopSalesmanAppliingList" resultType="com.matrix.system.fenxiao.vo.ShopSalesmanAppliingVo">
+		SELECT
+		a.user_id userId,
+		b.nick_name nickName
 		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}
-			<if test="record.shenheState != null and record.shenheState != ''">
-				and a.apply_status=#{shenheState}
+			and 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},'%')
 			</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