xinyin025/smart-admin
1
0
Fork 0
mirror of https://gitee.com/lab1024/smart-admin.git synced 2025-09-17 19:06:39 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

!6 修复同电话员工校验

Browse Source 
Merge pull request !6 from Anonym/master
This commit is contained in:
yandy_java 2021-01-18 21:55:43 +08:00 committed by Gitee
commit 111d930f98
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/employee/EmployeeService.java
View File

@ -1,6 +1,7 @@
package net.lab1024.smartadmin.module.system.employee; package net.lab1024.smartadmin.module.system.employee;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; 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.constant.JudgeEnum;
import net.lab1024.smartadmin.common.domain.PageResultDTO; import net.lab1024.smartadmin.common.domain.PageResultDTO;
import net.lab1024.smartadmin.common.domain.ResponseDTO; 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.SmartDigestUtil;
import net.lab1024.smartadmin.util.SmartPageUtil; import net.lab1024.smartadmin.util.SmartPageUtil;
import net.lab1024.smartadmin.util.SmartVerificationUtil; import net.lab1024.smartadmin.util.SmartVerificationUtil;
import com.google.common.collect.Lists;
import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.collections.map.HashedMap; import org.apache.commons.collections.map.HashedMap;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.time.LocalDateTime;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
@ -75,7 +74,7 @@ public class EmployeeService {
*/ */
private static final ConcurrentHashMap<Long, EmployeeBO> employeeCache = new ConcurrentHashMap<>(); private static final ConcurrentHashMap<Long, EmployeeBO> employeeCache = new ConcurrentHashMap<>();
public List<EmployeeVO> getAllEmployee(){ public List<EmployeeVO> getAllEmployee() {
return employeeDao.selectAll(); return employeeDao.selectAll();
} }
@ -120,7 +119,7 @@ public class EmployeeService {
for (EmployeeDTO employeeDTO : employeeList) { for (EmployeeDTO employeeDTO : employeeList) {
List<PositionRelationResultDTO> relationResultDTOList = employeePositionMap.get(employeeDTO.getId()); List<PositionRelationResultDTO> relationResultDTOList = employeePositionMap.get(employeeDTO.getId());
if(relationResultDTOList != null){ if (relationResultDTOList != null) {
employeeDTO.setPositionRelationList(relationResultDTOList); employeeDTO.setPositionRelationList(relationResultDTOList);
employeeDTO.setPositionName(relationResultDTOList.stream().map(PositionRelationResultDTO::getPositionName).collect(Collectors.joining(","))); employeeDTO.setPositionName(relationResultDTOList.stream().map(PositionRelationResultDTO::getPositionName).collect(Collectors.joining(",")));
} }
@ -156,7 +155,7 @@ public class EmployeeService {
return ResponseDTO.wrap(EmployeeResponseCodeConst.LOGIN_NAME_EXISTS); 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) { if (null != samePhoneEmployee) {
return ResponseDTO.wrap(EmployeeResponseCodeConst.PHONE_EXISTS); return ResponseDTO.wrap(EmployeeResponseCodeConst.PHONE_EXISTS);
} }

2
smart-admin-service/smart-admin-api/src/main/resources/mapper/system/employee/EmployeeMapper.xml
View File

@ -106,7 +106,7 @@
FROM FROM
t_employee e t_employee e
WHERE WHERE
e.login_name = #{phone} and e.is_disabled = #{isDisabled} e.phone = #{phone} and e.is_disabled = #{isDisabled}
</select> </select>