|
@@ -240,11 +240,13 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
|
|
|
user.setPassword(null);
|
|
|
userList.add(user);
|
|
|
} else if (checkType == 1) {
|
|
|
+ System.out.println(""+deptId+" , "+user.getDepartmentId());
|
|
|
//当前人员如果不在该计划部门下面,属于外调的,那他的审核人应该是该部门的主要负责人(工长)
|
|
|
if (!deptId.equals(user.getDepartmentId())) {
|
|
|
Department department = departmentMapper.selectById(deptId);
|
|
|
- Integer superiorId = department.getSuperiorId();
|
|
|
- User targetUser = userMapper.selectOne(new QueryWrapper<User>().select("id, name, corpwx_userid").eq("id", superiorId));
|
|
|
+ String managerId = department.getManagerId();
|
|
|
+ User targetUser = userMapper.selectOne(new QueryWrapper<User>().select("id, name, corpwx_userid").eq("id", managerId));
|
|
|
+ System.out.println("targetUser:"+targetUser.getName());
|
|
|
userList.add(targetUser);
|
|
|
} else {
|
|
|
List<Department> allDeptList = departmentMapper.selectList(new QueryWrapper<Department>().eq("company_id", user.getCompanyId()));
|