From eea390a5cf885900ad5d8328ed9fd8924b18796b Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期一, 17 十月 2022 09:22:23 +0800
Subject: [PATCH] 修改Bug
---
flower_city/src/main/java/com/dg/core/service/impl/SysUserServiceImpl.java | 88 ++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 85 insertions(+), 3 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 5576c54..ccd6ad0 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
@@ -147,7 +147,89 @@
departmentIds=this.getDepartmentIds(organizationChartEntitiesUser,departmentIds);
}
}
- return baseMapper.selectListByDepartmentId(departmentIds,","+classifyId,classifyId+",");
+ if (classifyId==null)
+ return baseMapper.selectListByDepartmentId(departmentIds,null,null);
+ else
+ return baseMapper.selectListByDepartmentId(departmentIds,","+classifyId,classifyId+",");
+ }
+
+ @Override
+ public ResultData loginByPhonenumber(String phonenumber)
+ {
+ SysUser sysUser = baseMapper.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getPhonenumber, phonenumber));
+ if (sysUser==null){
+ //查询花城e+是否存在此用户
+ HuaChengSysUser huaChengSysUser=iHuaChengSysUserService.selectData("","",phonenumber);
+ SysUser newUser = new SysUser();
+ if(huaChengSysUser==null)
+ {
+ newUser.setUserId(Snowflake.getId());
+ newUser.setLoginName(phonenumber);
+ newUser.setUserName(phonenumber.substring(0,3)+"xxxx"+phonenumber.substring(7,11)+"用户");
+ newUser.setUserType("3");
+ newUser.setPhonenumber(phonenumber);
+ newUser.setSex("1");
+ newUser.setCreateTime(LocalDateTime.now());
+ newUser.setUpdateTime(LocalDateTime.now());
+ baseMapper.insertConfig(newUser);
+ }
+ else
+ {
+ newUser.setUserId(huaChengSysUser.getUserId());
+ newUser.setLoginName(huaChengSysUser.getPhone());
+ newUser.setUserName(huaChengSysUser.getNickName());
+ newUser.setUserType("3");
+ newUser.setPhonenumber(huaChengSysUser.getPhone());
+ newUser.setSex(huaChengSysUser.getSex());
+ newUser.setAvatar(huaChengSysUser.getImageUrl());
+ newUser.setCreateTime(LocalDateTime.now());
+ newUser.setUpdateTime(LocalDateTime.now());
+ newUser.setOpenid(huaChengSysUser.getOpenid());
+ baseMapper.insertConfig(newUser);
+ }
+
+ 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);
+ if (token == null) {
+ //生成一个token，保存用户登录状态
+ token = tokenManager.createToken(sysUser.getUserId(), sysUser.getUserId());
+ }
+
+ sysUser.setLoginDate(LocalDateTime.now());
+ //更新登录时间
+ this.updateConfig(sysUser);
+
+ Map<String, Object> map = new HashMap<>();
+ map.put("token", token);
+ map.put("userId", sysUser.getUserId());
+ map.put("userName", sysUser.getUserName());
+
+ return ResultData.success(map);
+ }
+ }
+
+ @Override
+ public List<SysUser> queryList(Integer userType) {
+ return baseMapper.queryList(userType);
}
public List<String> getDepartmentIds( List<OrganizationChartEntity> organizationChartEntities,List<String> departmentIds){
@@ -168,8 +250,8 @@
}
@Override
- public SysUser selectData(String userId) {
- return baseMapper.selectData(userId);
+ public SysUser selectData(String userId,String phonenumber) {
+ return baseMapper.selectData(userId,phonenumber);
}
--
Gitblit v1.7.1