Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
V
volunteer_service
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
licc
volunteer_service
Commits
16214930
Commit
16214930
authored
Apr 15, 2021
by
xc
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
登录bug修复,增加字段联合查询导致的
parent
231dcee3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
11 deletions
+13
-11
UsersMapper.xml
wisenergy-mapper/src/main/resources/mapper/UsersMapper.xml
+1
-0
UserLoginServiceImpl.java
...a/cn/wisenergy/service/app/impl/UserLoginServiceImpl.java
+8
-8
UserServiceImpl.java
...n/java/cn/wisenergy/service/app/impl/UserServiceImpl.java
+4
-3
No files found.
wisenergy-mapper/src/main/resources/mapper/UsersMapper.xml
View file @
16214930
...
@@ -92,6 +92,7 @@
...
@@ -92,6 +92,7 @@
<if
test=
"phone != null and phone !=''"
>
and phone = #{phone}
</if>
<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=
"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=
"vip_mobile != null and vip_mobile !=''"
>
and vip_mobile = #{vip_mobile}
</if>
<if
test=
"openid != null and openid !=''"
>
and openid = #{openid}
</if>
</where>
</where>
</select>
</select>
...
...
wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UserLoginServiceImpl.java
View file @
16214930
...
@@ -116,10 +116,10 @@ public class UserLoginServiceImpl extends ServiceImpl<UsersMapper, User> impleme
...
@@ -116,10 +116,10 @@ public class UserLoginServiceImpl extends ServiceImpl<UsersMapper, User> impleme
}
}
//1、判断手机号账户是否存在
//1、判断手机号账户是否存在
QueryWrapper
<
User
>
queryWrapper
=
new
QueryWrapper
<>(
);
Map
<
String
,
Object
>
map
=
new
HashMap
<>(
16
);
queryWrapper
.
eq
(
"phone"
,
userVo
.
getPhone
());
map
.
put
(
"phone"
,
userVo
.
getPhone
());
queryWrapper
.
eq
(
"is_delete"
,
0
);
map
.
put
(
"is_delete"
,
0
);
User
user
=
baseMapper
.
selectOne
(
queryWrapper
);
User
user
=
usersMapper
.
selectOne
(
map
);
Subject
subject
=
SecurityUtils
.
getSubject
();
Subject
subject
=
SecurityUtils
.
getSubject
();
UserToken
userToken
=
new
UserToken
(
userVo
.
getPhone
(),
userVo
.
getCode
(),
CODE_LOGIN_TYPE
);
UserToken
userToken
=
new
UserToken
(
userVo
.
getPhone
(),
userVo
.
getCode
(),
CODE_LOGIN_TYPE
);
...
@@ -309,10 +309,10 @@ public class UserLoginServiceImpl extends ServiceImpl<UsersMapper, User> impleme
...
@@ -309,10 +309,10 @@ public class UserLoginServiceImpl extends ServiceImpl<UsersMapper, User> impleme
}
}
//获取用户信息
//获取用户信息
QueryWrapper
<
User
>
queryWrapper
=
new
QueryWrapper
<>(
);
Map
<
String
,
Object
>
map
=
new
HashMap
<>(
16
);
queryWrapper
.
eq
(
"phone"
,
userVo
.
getPhone
());
map
.
put
(
"phone"
,
userVo
.
getPhone
());
queryWrapper
.
eq
(
"is_delete"
,
0
);
map
.
put
(
"is_delete"
,
0
);
User
user
=
baseMapper
.
selectOne
(
queryWrapper
);
User
user
=
usersMapper
.
selectOne
(
map
);
if
(
null
==
user
)
{
if
(
null
==
user
)
{
return
R
.
error
(
"用户信息不存在,无法重置密码!"
);
return
R
.
error
(
"用户信息不存在,无法重置密码!"
);
}
}
...
...
wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UserServiceImpl.java
View file @
16214930
...
@@ -442,9 +442,10 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
...
@@ -442,9 +442,10 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
if
(
null
==
map
.
get
(
"openid"
)){
if
(
null
==
map
.
get
(
"openid"
)){
return
R
.
error
(
map
.
get
(
"errmsg"
).
toString
());
return
R
.
error
(
map
.
get
(
"errmsg"
).
toString
());
}
}
QueryWrapper
<
User
>
objectQueryWrapper
=
new
QueryWrapper
<>();
Map
<
String
,
Object
>
maps
=
new
HashMap
<>(
16
);
objectQueryWrapper
.
eq
(
"openid"
,
map
.
get
(
"openid"
).
toString
());
maps
.
put
(
"openid"
,
map
.
get
(
"openid"
).
toString
());
User
user
=
baseMapper
.
selectOne
(
objectQueryWrapper
);
User
user
=
usersMapper
.
selectOne
(
maps
);
if
(
null
==
user
){
if
(
null
==
user
){
return
R
.
error
(
"该用户还没有授权"
);
return
R
.
error
(
"该用户还没有授权"
);
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment