From dd730295a1df836c872d22a69a816f52e4c5d431 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期三, 19 十月 2022 15:05:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/service/impl/SysUserServiceImpl.java | 31 +++++++++++++++++--------------
1 files changed, 17 insertions(+), 14 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..f1da8e2 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());
@@ -237,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) {
+ return baseMapper.selectData(userId,phonenumber);
}
@@ -281,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