From 2d25e6b0185514c95552c41af1da371cc1cc17cd Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期二, 15 十一月 2022 17:52:42 +0800
Subject: [PATCH] 修改办事指南所属部门集合
---
flower_city/src/main/java/com/dg/core/service/impl/SysUserServiceImpl.java | 84 +++++++++++++++++++++++++++++------------
1 files changed, 59 insertions(+), 25 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..c622e3a 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
@@ -49,13 +49,8 @@
@Override
public SysUser getUserByAccount(String account) {
- HashMap<String, Object> map = new HashMap();
- map.put("login_name", account);
- List<SysUser> sysUsers = baseMapper.selectByMap(map);
- if (sysUsers.size() > 0) {
- return sysUsers.get(0);
- }
- return null;
+ SysUser sysUsers = baseMapper.getUserByAccount(account);
+ return sysUsers;
}
@Override
@@ -70,11 +65,18 @@
SysUser sysUser = baseMapper.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getPhonenumber, phonenumber));
if (sysUser==null){
//查询花城e+是否存在此用户
- HuaChengSysUser huaChengSysUser=iHuaChengSysUserService.selectData("","",phonenumber);
+ List<HuaChengSysUser> list=iHuaChengSysUserService.selectData("","",phonenumber);
+ HuaChengSysUser huaChengSysUser=null;
+
+ if(list!=null || list.size()>0 )
+ {
+ huaChengSysUser=list.get(0);
+ }
+
if(huaChengSysUser==null)
{
SysUser newUser = new SysUser();
- newUser.setUserId(Snowflake.getId());
+ newUser.setUserId(Snowflake.getId()+"");
newUser.setLoginName(phonenumber);
newUser.setUserName(phonenumber.substring(0,3)+"xxxx"+phonenumber.substring(7,11)+"用户");
newUser.setUserType("3");
@@ -87,7 +89,7 @@
else
{
SysUser newUser = new SysUser();
- newUser.setUserId(huaChengSysUser.getUserId());
+ newUser.setUserId(huaChengSysUser.getUserId()+"");
newUser.setLoginName(huaChengSysUser.getPhone());
newUser.setUserName(huaChengSysUser.getNickName());
newUser.setUserType("3");
@@ -147,7 +149,10 @@
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
@@ -156,11 +161,18 @@
SysUser sysUser = baseMapper.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getPhonenumber, phonenumber));
if (sysUser==null){
//查询花城e+是否存在此用户
- HuaChengSysUser huaChengSysUser=iHuaChengSysUserService.selectData("","",phonenumber);
+ List<HuaChengSysUser> list=iHuaChengSysUserService.selectData("","",phonenumber);
+ HuaChengSysUser huaChengSysUser=null;
+
+ if(list!=null || list.size()>0 )
+ {
+ huaChengSysUser=list.get(0);
+ }
+
+ SysUser newUser = new SysUser();
if(huaChengSysUser==null)
{
- SysUser newUser = new SysUser();
- newUser.setUserId(Snowflake.getId());
+ newUser.setUserId(Snowflake.getId()+"");
newUser.setLoginName(phonenumber);
newUser.setUserName(phonenumber.substring(0,3)+"xxxx"+phonenumber.substring(7,11)+"用户");
newUser.setUserType("3");
@@ -172,7 +184,6 @@
}
else
{
- SysUser newUser = new SysUser();
newUser.setUserId(huaChengSysUser.getUserId());
newUser.setLoginName(huaChengSysUser.getPhone());
newUser.setUserName(huaChengSysUser.getNickName());
@@ -185,10 +196,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 +234,11 @@
return ResultData.success(map);
}
+ }
- return ResultData.error("用户不存在");
+ @Override
+ public List<SysUser> queryList(Integer userType,String keyWord) {
+ return baseMapper.queryList(userType,keyWord);
}
public List<String> getDepartmentIds( List<OrganizationChartEntity> organizationChartEntities,List<String> departmentIds){
@@ -225,13 +254,13 @@
}
@Override
- public List<SysUser> selectConfigList(IPage<SysUser> page, Integer state,String userType) {
- return baseMapper.selectConfigList(page, state,userType);
+ public List<SysUser> selectConfigList(IPage<SysUser> page, Integer state,String userType,String userName,List<String> ids) {
+ return baseMapper.selectConfigList(page, state,userType,userName,ids);
}
@Override
- public SysUser selectData(String userId) {
- return baseMapper.selectData(userId);
+ public SysUser selectData(String userId,String phonenumber,String loginName) {
+ return baseMapper.selectData(userId,phonenumber,loginName);
}
@@ -269,10 +298,15 @@
}
@Override
- public int selectNum(String userType) {
- return baseMapper.selectNum(userType);
+ public int selectNum(String userType,String userName,List<String> ids) {
+ return baseMapper.selectNum(userType,userName,ids);
}
+
+
+
+
+
}
--
Gitblit v1.7.1