chao 4 роки тому
батько
коміт
740ef32dd0

+ 1 - 0
pom.xml

@@ -163,6 +163,7 @@
                 <!--可以在此配置过滤文件  -->
                 <!--可以在此配置过滤文件  -->
                 <includes>
                 <includes>
                     <include>**/*.yml</include>
                     <include>**/*.yml</include>
+                    <include>**/*.xml</include>
                 </includes>
                 </includes>
                 <!--开启filtering功能  -->
                 <!--开启filtering功能  -->
                 <filtering>true</filtering>
                 <filtering>true</filtering>

+ 0 - 3
src/main/java/com/caimei365/user/mapper/LoginMapper.java

@@ -1,14 +1,11 @@
 package com.caimei365.user.mapper;
 package com.caimei365.user.mapper;
 
 
 import com.caimei365.user.model.po.OperationPo;
 import com.caimei365.user.model.po.OperationPo;
-import com.caimei365.user.model.vo.ClubVo;
 import com.caimei365.user.model.vo.ServiceProviderVo;
 import com.caimei365.user.model.vo.ServiceProviderVo;
 import com.caimei365.user.model.vo.UserLoginVo;
 import com.caimei365.user.model.vo.UserLoginVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Param;
 
 
-import java.util.List;
-
 /**
 /**
  * Description
  * Description
  *
  *

+ 5 - 5
src/main/resources/mapper/LoginMapper.xml

@@ -38,7 +38,7 @@
         where (u.bindMobile = #{mobileOrEmail}
         where (u.bindMobile = #{mobileOrEmail}
                 or u.email = #{mobileOrEmail}
                 or u.email = #{mobileOrEmail}
                 or (cu.mobile = #{mobileOrEmail} and cu.delFlag != 1)
                 or (cu.mobile = #{mobileOrEmail} and cu.delFlag != 1)
-        ) and u.userIdentity in (1,2,3,4)
+        ) and u.userIdentity in (1,2,3,4) and u.userOrganizeID = 0
         limit 1
         limit 1
     </select>
     </select>
     <select id="getOperationByMobile" resultType="com.caimei365.user.model.po.OperationPo">
     <select id="getOperationByMobile" resultType="com.caimei365.user.model.po.OperationPo">
@@ -83,7 +83,7 @@
         from
         from
           cm_mall_operation_user o
           cm_mall_operation_user o
         where unionId = #{unionId} and delFlag = '0'
         where unionId = #{unionId} and delFlag = '0'
-        and (userOrganizeID='2' or userOrganizeID is null)
+        and userOrganizeID=0
         limit 1
         limit 1
     </select>
     </select>
     <select id="getOperationUserByOpenId" resultType="com.caimei365.user.model.vo.UserLoginVo">
     <select id="getOperationUserByOpenId" resultType="com.caimei365.user.model.vo.UserLoginVo">
@@ -114,7 +114,7 @@
             openid = #{openId}
             openid = #{openId}
         </if>
         </if>
         and delFlag = '0'
         and delFlag = '0'
-        and (userOrganizeID='2' or userOrganizeID is null)
+        and userOrganizeID=0
         limit 1
         limit 1
     </select>
     </select>
     <update id="updateServiceProviderUnionId">
     <update id="updateServiceProviderUnionId">
@@ -186,7 +186,7 @@
             openid = #{openId}
             openid = #{openId}
         </if>
         </if>
         and delFlag = '0'
         and delFlag = '0'
-        and (userOrganizeID='2' or userOrganizeID is null)
+        and userOrganizeID=0
         limit 1
         limit 1
     </select>
     </select>
 
 
@@ -210,7 +210,7 @@
         LEFT JOIN user u ON u.userID = cou.userID
         LEFT JOIN user u ON u.userID = cou.userID
         WHERE
         WHERE
             cou.invitationCode = #{invitationCode}
             cou.invitationCode = #{invitationCode}
-        AND (cou.userOrganizeID = '2' OR cou.userOrganizeID IS NULL)
+        AND cou.userOrganizeID = 0
         AND u.userIdentity in (2,3,4)
         AND u.userIdentity in (2,3,4)
     </select>
     </select>
     <select id="getClubCountByClubName" resultType="java.lang.Integer">
     <select id="getClubCountByClubName" resultType="java.lang.Integer">