FatttSnake/Pinnacle-OA
1
0
Fork 0
mirror of https://github.com/FatttSnake/Pinnacle-OA.git synced 2026-04-06 07:21:24 +08:00
Code Packages Releases Activity

Added DepartmentManagement

Browse Source
This commit is contained in:
Fat Snake
2023-06-03 07:32:34 +08:00
parent ef69337e97
commit a2c6571c0e
12 changed files with 443 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Pinnacle/src/main/java/com/cfive/pinnacle/service/impl/DepartmentServiceImpl.java
View File

@@ -1,5 +1,7 @@
package com.cfive.pinnacle.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO;
import com.cfive.pinnacle.entity.Department;
import com.cfive.pinnacle.mapper.DepartmentMapper;
import com.cfive.pinnacle.service.IDepartmentService;
@@ -19,11 +21,28 @@ import java.util.List;
*/
@Service
public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Department> implements IDepartmentService {
@Autowired
private DepartmentMapper departmentMapper;
@Autowired
public void setDepartmentMapper(DepartmentMapper departmentMapper) {
this.departmentMapper = departmentMapper;
}
@Override
@Deprecated
public List<Department> getDepartAndUser() {
return departmentMapper.getDepartAndUser();
}
@Override
public IPage<Department> getAllDepartment(Long currentPage, Long pageSize, Integer searchType, String searchInput) {
IPage<Department> departmentIPage;
if (currentPage == null || pageSize == null) {
departmentIPage = PageDTO.of(0, -1);
} else {
departmentIPage = PageDTO.of(currentPage, pageSize);
}
searchInput = searchInput.trim();
return departmentMapper.getAllDepartment(departmentIPage, searchType, searchInput);
}
}

2
Pinnacle/src/main/java/com/cfive/pinnacle/service/impl/StaffServiceImpl.java
View File

@@ -47,7 +47,7 @@ public class StaffServiceImpl extends ServiceImpl<StaffMapper, Staff> implements
} else {
userIPage = PageDTO.of(currentPage, pageSize);
}
searchInput = searchInput.trim();
searchInput = searchInput.trim();
return staffMapper.getAllStaff(userIPage, departmentId, searchType, searchInput, searchGender, searchBirthFrom, searchBirthTo);
}