selectUserByMobile

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserBaseInfoDao.java

@@ -92,4 +92,6 @@ public interface UserBaseInfoDao extends BaseDao<UserBaseInfoEntity> {
                              @Param("excludeUserId")String excludeUserId);
 
     String selectIdCard(String userId);
+
+    UserBaseInfoEntity selectUserByMobile(@Param("customerId") String customerId, @Param("mobile")String mobile);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java

@@ -551,10 +551,7 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl<UserBaseInfoDao, Us
         result.setGridName(StrConstant.EPMETY_STR);
         result.setAgencyId(StrConstant.EPMETY_STR);
         //根据手机号从baseinfo查对应的信息，如果有则返回，没有则注册
-        LambdaQueryWrapper<UserBaseInfoEntity> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(UserBaseInfoEntity::getCustomerId, formDTO.getCustomerId());
-        wrapper.eq(UserBaseInfoEntity::getMobile, formDTO.getMobile());
-        UserBaseInfoEntity baseInfo = baseDao.selectOne(wrapper);
+        UserBaseInfoEntity baseInfo = baseDao.selectUserByMobile(formDTO.getCustomerId(),formDTO.getMobile());
         if (null == baseInfo) {
             //注册
             UserEntity userEntity = new UserEntity();

epmet-user/epmet-user-server/src/main/resources/mapper/UserBaseInfoDao.xml

@@ -153,4 +153,17 @@
             ubi.USER_ID = #{userId}
             AND ubi.DEL_FLAG = '0'
     </select>
+
+    <select id="selectUserByMobile" parameterType="map" resultType="com.epmet.entity.UserBaseInfoEntity">
+        SELECT
+            ubi.*
+        FROM
+            user_base_info ubi
+                LEFT JOIN user_wechat uw ON ( ubi.USER_ID = uw.USER_ID AND ubi.CUSTOMER_ID = uw.CUSTOMER_ID )
+        WHERE
+            ubi.CUSTOMER_ID = #{customerId}
+          AND ubi.MOBILE = #{mobile}
+          AND uw.DEL_FLAG = '0'
+          AND ubi.DEL_FLAG = '0'
+    </select>
 </mapper>