From e3dde06b9508324670fef4baa54c749705db8297 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期一, 10 十月 2022 14:27:27 +0800
Subject: [PATCH] 修改导办人员登录
---
flower_city/src/main/java/com/dg/core/service/impl/SysUserServiceImpl.java | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/service/impl/SysUserServiceImpl.java b/flower_city/src/main/java/com/dg/core/service/impl/SysUserServiceImpl.java
index 0e5eaaa..505ff13 100644
--- a/flower_city/src/main/java/com/dg/core/service/impl/SysUserServiceImpl.java
+++ b/flower_city/src/main/java/com/dg/core/service/impl/SysUserServiceImpl.java
@@ -157,9 +157,9 @@
if (sysUser==null){
//查询花城e+是否存在此用户
HuaChengSysUser huaChengSysUser=iHuaChengSysUserService.selectData("","",phonenumber);
+ SysUser newUser = new SysUser();
if(huaChengSysUser==null)
{
- SysUser newUser = new SysUser();
newUser.setUserId(Snowflake.getId());
newUser.setLoginName(phonenumber);
newUser.setUserName(phonenumber.substring(0,3)+"xxxx"+phonenumber.substring(7,11)+"用户");
@@ -172,7 +172,6 @@
}
else
{
- SysUser newUser = new SysUser();
newUser.setUserId(huaChengSysUser.getUserId());
newUser.setLoginName(huaChengSysUser.getPhone());
newUser.setUserName(huaChengSysUser.getNickName());
@@ -185,10 +184,25 @@
newUser.setOpenid(huaChengSysUser.getOpenid());
baseMapper.insertConfig(newUser);
}
- }
- sysUser = baseMapper.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getPhonenumber, phonenumber));
- if (sysUser!=null) {
+ String token = tokenManager.getTokenByUserId(newUser.getUserId());
+// String token = tokenManager.createToken(user.getUserId(), user.getRoleId());
+ System.out.println("token " + token);
+ if (token == null) {
+ //生成一个token，保存用户登录状态
+ token = tokenManager.createToken(newUser.getUserId(), newUser.getUserId());
+ }
+
+ Map<String, Object> map = new HashMap<>();
+ map.put("token", token);
+ map.put("userId", newUser.getUserId());
+ map.put("userName", newUser.getUserName());
+
+ return ResultData.success(map);
+
+ }
+ else
+ {
String token = tokenManager.getTokenByUserId(sysUser.getUserId());
// String token = tokenManager.createToken(user.getUserId(), user.getRoleId());
System.out.println("token " + token);
@@ -208,8 +222,6 @@
return ResultData.success(map);
}
-
- return ResultData.error("用户不存在");
}
public List<String> getDepartmentIds( List<OrganizationChartEntity> organizationChartEntities,List<String> departmentIds){
--
Gitblit v1.7.1