From 6e6f4887eaeb046ccdc76a79375a8c7ff47daa96 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期五, 21 十月 2022 17:52:18 +0800
Subject: [PATCH] Merge branch 'zigonggao_dev' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into zigonggao_dev
---
flower_city/src/main/java/com/dg/core/service/impl/SysUserServiceImpl.java | 31 +++++++++++++------------------
1 files changed, 13 insertions(+), 18 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 8a699d6..d2ff786 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
@@ -74,7 +69,7 @@
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 +82,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");
@@ -163,7 +158,7 @@
SysUser newUser = new SysUser();
if(huaChengSysUser==null)
{
- 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");
@@ -228,8 +223,8 @@
}
@Override
- public List<SysUser> queryList(Integer userType) {
- return baseMapper.queryList(userType);
+ public List<SysUser> queryList(Integer userType,String keyWord) {
+ return baseMapper.queryList(userType,keyWord);
}
public List<String> getDepartmentIds( List<OrganizationChartEntity> organizationChartEntities,List<String> departmentIds){
@@ -245,13 +240,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) {
+ return baseMapper.selectConfigList(page, state,userType,userName);
}
@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);
}
@@ -289,8 +284,8 @@
}
@Override
- public int selectNum(String userType) {
- return baseMapper.selectNum(userType);
+ public int selectNum(String userType,String userName) {
+ return baseMapper.selectNum(userType,userName);
}
--
Gitblit v1.7.1