From edafbe0ba23a5a482835f4e8d0ecbbf35ee5075d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9F=A9=E9=B9=8F=E8=BE=89?= <18322780655@163.com>
Date: Tue, 1 Aug 2023 14:37:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=9B=E5=AE=A2=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/system/service/Userservice.java     |  3 +-
 .../mapper/TbPlussUserPromotionMapper.xml     | 46 +++++++++++--------
 2 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/service/Userservice.java b/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/service/Userservice.java
index 7fcc8b0..147fe64 100644
--- a/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/service/Userservice.java
+++ b/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/service/Userservice.java
@@ -48,8 +48,7 @@ public class Userservice {
     TbPlussMerchantBaseInfoMapper baseInfoMapper;
 
     public RespBody doLogin(String loginName,String password,String userType,String ip) throws Exception {
-
-            Boolean flag=false;
+        Boolean flag=false;
         if("FO".equals(userType)||"SO".equals(userType)||"MG".equals(userType)){
             flag=true;
         }
diff --git a/newadmin/dao-api/src/main/resources/mapper/TbPlussUserPromotionMapper.xml b/newadmin/dao-api/src/main/resources/mapper/TbPlussUserPromotionMapper.xml
index 63f0bb1..6048e54 100644
--- a/newadmin/dao-api/src/main/resources/mapper/TbPlussUserPromotionMapper.xml
+++ b/newadmin/dao-api/src/main/resources/mapper/TbPlussUserPromotionMapper.xml
@@ -265,30 +265,36 @@
 
   <select id="selectMarkByUserId" resultType="java.util.Map">
     SELECT
-      m.user_id as userId,
-      m.`name`,
-      m.phone,
-      m.`status`,
-      m.remark,
-      m.create_time as createTime,
-      m.update_time as updateTime
-
+    m.user_id AS userId,
+    m.`name`,
+    m.phone,
+    m.`status`,
+    m.remark,
+    m.create_time AS createTime,
+    m.update_time AS updateTime
     FROM
-      (
-        SELECT
-          @ids AS _ids,
-          ( SELECT @ids := GROUP_CONCAT( user_id ) FROM tb_pluss_user_promotion WHERE FIND_IN_SET( parent_user_id, @ids ) ) AS cids,
-      @l := @l + 1 AS LEVEL
+    tb_pluss_user_marker m
+    LEFT JOIN (
+    SELECT
+    p.user_id
     FROM
-      tb_pluss_user_promotion,
-      ( SELECT @ids := #{userId}, @l := 0 ) b
+    (
+    SELECT
+    @ids AS _ids,
+    ( SELECT @ids := GROUP_CONCAT( user_id ) FROM tb_pluss_user_promotion WHERE FIND_IN_SET( parent_user_id, @ids ) ) AS cids,
+    @l := @l + 1 AS LEVEL
+    FROM
+    tb_pluss_user_promotion,
+    ( SELECT @ids := #{userId}, @l := 0 ) b
     WHERE
-      @ids IS NOT NULL
-      ) ID,
-      tb_pluss_user_promotion p right join tb_pluss_user_maker m on p.user_id=m.user_id
+    @ids IS NOT NULL
+    ) ID,
+    tb_pluss_user_promotion p
     WHERE
-      FIND_IN_SET( p.user_id, ID._ids )
-      and p.type_code='MC'
+    p.type_code = 'MC'
+    AND FIND_IN_SET( p.user_id, ID._ids )
+    ) d ON m.user_id = d.user_id
+    where 1=1
       <if test="phone !=null and phone !=''">
         and m.phone=#{phone}
       </if>