From 53939e0ceb528f45c4906c86ce499ecb864f7af8 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Mon, 15 Mar 2021 14:38:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop
---
zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanApplyDao.xml | 11 +++++------
1 files changed, 5 insertions(+), 6 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 b661f60..ae87aa8 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanApplyDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanApplyDao.xml
@@ -118,18 +118,17 @@
</select>
<select id="selectBizUserApplyList" resultType="com.matrix.system.fenxiao.vo.ShopSalesmanAppliingVo">
SELECT
- a.open_id userId,
+ a.user_id userId,
+ a.open_id openId,
a.nick_name nickName,
a.avatar_url avatarUrl,
a.create_time createTime,
a.phone_number phone
FROM
biz_user a
- LEFT JOIN shop_salesman_apply b ON a.open_id = b.user_id
<where>
a.company_id = #{record.companyId}
and a.is_sales != 1
- and b.apply_status not in (1,2)
<if test="record.nickName != null and record.nickName != ''">
and a.nick_name like concat('%',#{record.nickName},'%')
</if>
@@ -220,9 +219,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
- <where>
- a.company_id=#{companyId} and a.user_id = #{userId}
- </where>
+ where a.id = #{applyId}
</select>
<select id="findCustomDetail" resultType="com.matrix.system.fenxiao.vo.ShopCustomDetailVo">
@@ -240,6 +237,7 @@
a.company_id = #{record.companyId}
AND b.is_sales != 1
and b.parent_open_id = #{record.userId}
+ and a.apply_status = 2
<if test="record.userName != null and record.userName != ''">
and b.nick_name like concat('%',#{record.userName},'%')
</if>
@@ -263,6 +261,7 @@
a.company_id = #{record.companyId}
AND b.is_sales = 1
and b.parent_open_id = #{record.userId}
+ and a.apply_status = 2
<if test="record.userName != null and record.userName != ''">
and b.nick_name like concat('%',#{record.userName},'%')
</if>
--
Gitblit v1.9.1