修改创客逻辑

newadmin/admin/src/main/java/com/chaozhanggui/admin/system/service/Userservice.java

@@ -48,7 +48,6 @@ public class Userservice {
     TbPlussMerchantBaseInfoMapper baseInfoMapper;
 
     public RespBody doLogin(String loginName,String password,String userType,String ip) throws Exception {
-
         Boolean flag=false;
         if("FO".equals(userType)||"SO".equals(userType)||"MG".equals(userType)){
             flag=true;

newadmin/dao-api/src/main/resources/mapper/TbPlussUserPromotionMapper.xml

@@ -265,14 +265,18 @@
 
   <select id="selectMarkByUserId" resultType="java.util.Map">
     SELECT
-      m.user_id as userId,
+    m.user_id AS userId,
     m.`name`,
     m.phone,
     m.`status`,
     m.remark,
-      m.create_time as createTime,
-      m.update_time as updateTime
-
+    m.create_time AS createTime,
+    m.update_time AS updateTime
+    FROM
+    tb_pluss_user_marker m
+    LEFT JOIN (
+    SELECT
+    p.user_id
     FROM
     (
     SELECT
@@ -285,10 +289,12 @@
     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
+    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>