登录bug修复,增加字段联合查询导致的

wisenergy-mapper/src/main/resources/mapper/UsersMapper.xml

@@ -92,6 +92,7 @@
             <if test="phone != null and phone !=''">and phone =  #{phone}</if>
             <if test="is_delete != null and is_delete !=''">and is_delete =  #{is_delete}</if>
             <if test="vip_mobile != null and vip_mobile !=''">and vip_mobile =  #{vip_mobile}</if>
+            <if test="openid != null and openid !=''">and openid =  #{openid}</if>
         </where>
     </select>
 

wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UserLoginServiceImpl.java

@@ -116,10 +116,10 @@ public class UserLoginServiceImpl extends ServiceImpl<UsersMapper, User> impleme
         }
 
         //1、判断手机号账户是否存在
-        QueryWrapper<User> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("phone", userVo.getPhone());
-        queryWrapper.eq("is_delete", 0);
-        User user = baseMapper.selectOne(queryWrapper);
+        Map<String, Object> map = new HashMap<>(16);
+        map.put("phone", userVo.getPhone());
+        map.put("is_delete", 0);
+        User user = usersMapper.selectOne(map);
 
         Subject subject = SecurityUtils.getSubject();
         UserToken userToken = new UserToken(userVo.getPhone(), userVo.getCode(), CODE_LOGIN_TYPE);
@@ -309,10 +309,10 @@ public class UserLoginServiceImpl extends ServiceImpl<UsersMapper, User> impleme
         }
 
         //获取用户信息
-        QueryWrapper<User> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("phone", userVo.getPhone());
-        queryWrapper.eq("is_delete", 0);
-        User user = baseMapper.selectOne(queryWrapper);
+        Map<String, Object> map = new HashMap<>(16);
+        map.put("phone", userVo.getPhone());
+        map.put("is_delete", 0);
+        User user = usersMapper.selectOne(map);
         if (null == user) {
             return R.error("用户信息不存在，无法重置密码!");
         }

wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UserServiceImpl.java

@@ -442,9 +442,10 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
         if(null == map.get("openid")){
             return R.error(map.get("errmsg").toString());
         }
-        QueryWrapper<User> objectQueryWrapper = new QueryWrapper<>();
-        objectQueryWrapper.eq("openid",map.get("openid").toString());
-        User user = baseMapper.selectOne(objectQueryWrapper);
+        Map<String, Object> maps = new HashMap<>(16);
+        maps.put("openid", map.get("openid").toString());
+        User user = usersMapper.selectOne(maps);
+
         if(null == user){
             return R.error("该用户还没有授权");
         }