From 6082cdabe62d0569620f8db154f87edd67d01faf Mon Sep 17 00:00:00 2001
From: linhw <5331581+linhw11@user.noreply.gitee.com>
Date: Tue, 3 Sep 2024 17:45:00 +0800
Subject: [PATCH] ~

---
 .../java/com/ruoyi/app/controller/AppLoginController.java     | 4 ----
 .../src/main/resources/mapper/app/AppRegisterMapper.xml       | 2 +-
 .../ruoyi-gan/src/main/resources/mapper/app/AppUserMapper.xml | 2 +-
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppLoginController.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppLoginController.java
index 41e20af..928a0bf 100644
--- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppLoginController.java
+++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppLoginController.java
@@ -187,10 +187,6 @@ public class AppLoginController {
     @PostMapping("/login")
     @ApiOperation(value = "登录", notes = "登录")
     public R<?> login(@RequestBody LoginForm loginForm) {
-        String phone = loginForm.getPhoneNumber();
-        if (phone.indexOf("+") != -1) {
-            loginForm.setPhoneNumber(phone.substring(phone.indexOf("+") + 1,phone.length()));
-        }
         AppUser appUser = appUserService.selectAppUserByPhone(loginForm.getPhoneNumber());
 
         if (appUser == null) {
diff --git a/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppRegisterMapper.xml b/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppRegisterMapper.xml
index 7ddafbf..520ee4a 100644
--- a/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppRegisterMapper.xml
+++ b/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppRegisterMapper.xml
@@ -149,7 +149,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <select id="selectAppRegisterByphone" resultType="com.ruoyi.app.domain.AppRegister">
-        select * from app_register where phone = #{phoneNumber}
+        select * from app_register where phone like concat('%',#{phoneNumber})
     </select>
 
     <select id="selectAppRegisterByEmail" resultType="com.ruoyi.app.domain.AppRegister">
diff --git a/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppUserMapper.xml b/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppUserMapper.xml
index 495fa9f..81ca3f7 100644
--- a/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppUserMapper.xml
+++ b/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppUserMapper.xml
@@ -443,7 +443,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <select id="selectAppUserByPhone" resultType="com.ruoyi.app.domain.AppUser">
-        <include refid="selectAppUserVo"/> where phone = #{phoneNumber}
+        <include refid="selectAppUserVo"/> where phone like concat('%',#{phoneNumber})
     </select>
 
     <select id="selectAppUserByEmail" resultType="com.ruoyi.app.domain.AppUser">