From 46645e56965bd8e0a462305a8fcf69ecaaacbafa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=AE=97=E4=BA=AE?= Date: Wed, 9 Dec 2020 11:20:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=90=8C=E7=94=B5=E8=AF=9D?= =?UTF-8?q?=E5=91=98=E5=B7=A5=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/system/employee/EmployeeService.java | 9 ++++----- .../resources/mapper/system/employee/EmployeeMapper.xml | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/employee/EmployeeService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/employee/EmployeeService.java index 7e614e26..a689bea2 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/employee/EmployeeService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/employee/EmployeeService.java @@ -1,6 +1,7 @@ package net.lab1024.smartadmin.module.system.employee; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.google.common.collect.Lists; import net.lab1024.smartadmin.common.constant.JudgeEnum; import net.lab1024.smartadmin.common.domain.PageResultDTO; import net.lab1024.smartadmin.common.domain.ResponseDTO; @@ -25,14 +26,12 @@ import net.lab1024.smartadmin.util.SmartBeanUtil; import net.lab1024.smartadmin.util.SmartDigestUtil; import net.lab1024.smartadmin.util.SmartPageUtil; import net.lab1024.smartadmin.util.SmartVerificationUtil; -import com.google.common.collect.Lists; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.map.HashedMap; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.time.LocalDateTime; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -75,7 +74,7 @@ public class EmployeeService { */ private static final ConcurrentHashMap employeeCache = new ConcurrentHashMap<>(); - public List getAllEmployee(){ + public List getAllEmployee() { return employeeDao.selectAll(); } @@ -120,7 +119,7 @@ public class EmployeeService { for (EmployeeDTO employeeDTO : employeeList) { List relationResultDTOList = employeePositionMap.get(employeeDTO.getId()); - if(relationResultDTOList != null){ + if (relationResultDTOList != null) { employeeDTO.setPositionRelationList(relationResultDTOList); employeeDTO.setPositionName(relationResultDTOList.stream().map(PositionRelationResultDTO::getPositionName).collect(Collectors.joining(","))); } @@ -156,7 +155,7 @@ public class EmployeeService { return ResponseDTO.wrap(EmployeeResponseCodeConst.LOGIN_NAME_EXISTS); } //同电话员工 - EmployeeDTO samePhoneEmployee = employeeDao.getByPhone(entity.getLoginName(), EmployeeStatusEnum.NORMAL.getValue()); + EmployeeDTO samePhoneEmployee = employeeDao.getByPhone(entity.getPhone(), EmployeeStatusEnum.NORMAL.getValue()); if (null != samePhoneEmployee) { return ResponseDTO.wrap(EmployeeResponseCodeConst.PHONE_EXISTS); } diff --git a/smart-admin-service/smart-admin-api/src/main/resources/mapper/system/employee/EmployeeMapper.xml b/smart-admin-service/smart-admin-api/src/main/resources/mapper/system/employee/EmployeeMapper.xml index 09739d9a..b4feab0f 100644 --- a/smart-admin-service/smart-admin-api/src/main/resources/mapper/system/employee/EmployeeMapper.xml +++ b/smart-admin-service/smart-admin-api/src/main/resources/mapper/system/employee/EmployeeMapper.xml @@ -106,7 +106,7 @@ FROM t_employee e WHERE - e.login_name = #{phone} and e.is_disabled = #{isDisabled} + e.phone = #{phone} and e.is_disabled = #{isDisabled}