|
@@ -30,6 +30,7 @@ import vip.xiaonuo.common.page.CommonPageRequest;
|
|
|
import vip.xiaonuo.dev.modular.file.enums.DevFileEngineTypeEnum;
|
|
|
import vip.xiaonuo.dev.modular.file.service.DevFileService;
|
|
|
import vip.xiaonuo.modular.base.department.entity.Department;
|
|
|
+import vip.xiaonuo.modular.base.department.mapper.DepartmentMapper;
|
|
|
import vip.xiaonuo.modular.base.peoplelist.entity.PeopleList;
|
|
|
import vip.xiaonuo.modular.base.peoplelist.mapper.PeopleListMapper;
|
|
|
import vip.xiaonuo.modular.base.peoplelist.param.PeopleListAddParam;
|
|
@@ -52,6 +53,8 @@ public class PeopleListServiceImpl extends ServiceImpl<PeopleListMapper, PeopleL
|
|
|
|
|
|
@Autowired
|
|
|
private DevFileService devFileService;
|
|
|
+ @Autowired
|
|
|
+ private DepartmentMapper departmentMapper;
|
|
|
@Override
|
|
|
public Page<PeopleList> page(PeopleListPageParam peopleListPageParam) {
|
|
|
QueryWrapper<PeopleList> queryWrapper = new QueryWrapper<>();
|
|
@@ -95,7 +98,9 @@ public class PeopleListServiceImpl extends ServiceImpl<PeopleListMapper, PeopleL
|
|
|
people.setWorkDay(workDay);
|
|
|
people.setWorkStatus(workStatus);
|
|
|
people.setJob(job);
|
|
|
- people.setDepartment(department);
|
|
|
+ QueryWrapper<Department> queryWrapper = new QueryWrapper<>();
|
|
|
+ queryWrapper.eq("id", department);
|
|
|
+ people.setDepartment(departmentMapper.selectOne(queryWrapper).getDepartmentName());
|
|
|
people.setWorkLocation(workLocation);
|
|
|
people.setWorkTime(workTime);
|
|
|
people.setPhone(phone);
|
|
@@ -131,7 +136,9 @@ public class PeopleListServiceImpl extends ServiceImpl<PeopleListMapper, PeopleL
|
|
|
people.setWorkDay(workDay);
|
|
|
people.setWorkStatus(workStatus);
|
|
|
people.setJob(job);
|
|
|
- people.setDepartment(department);
|
|
|
+ QueryWrapper<Department> queryWrapper = new QueryWrapper<>();
|
|
|
+ queryWrapper.eq("id", department);
|
|
|
+ people.setDepartment(departmentMapper.selectOne(queryWrapper).getDepartmentName());
|
|
|
people.setWorkLocation(workLocation);
|
|
|
people.setWorkTime(workTime);
|
|
|
people.setPhone(phone);
|