From 29fcb54693e8730251382d1446872bc0d7e8a964 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期二, 18 十月 2022 09:39:37 +0800
Subject: [PATCH] 修改新增普通用户报错 bug
---
flower_city/src/main/java/com/dg/core/service/impl/SysUserServiceImpl.java | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 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 505ff13..3106c5d 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
@@ -147,7 +142,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
@@ -224,6 +222,11 @@
}
}
+ @Override
+ public List<SysUser> queryList(Integer userType) {
+ return baseMapper.queryList(userType);
+ }
+
public List<String> getDepartmentIds( List<OrganizationChartEntity> organizationChartEntities,List<String> departmentIds){
for (OrganizationChartEntity organizationChart:organizationChartEntities) {
departmentIds.add(organizationChart.getId().toString());
@@ -242,8 +245,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