|
@@ -69,7 +69,7 @@ public class WorkScheduleServiceImpl implements WorkScheduleService {
|
|
|
}
|
|
}
|
|
|
// List<OutSign> meOutSigns = outSignDao.findByEnuuAndEmcode(enuu,
|
|
// List<OutSign> meOutSigns = outSignDao.findByEnuuAndEmcode(enuu,
|
|
|
// emcode);
|
|
// emcode);
|
|
|
- List<OfficeTask> task = officeTaskDao.findByUuAndRecordercode(enuu, emcode);
|
|
|
|
|
|
|
+ List<OfficeTask> task = officeTaskDao.findByUuAndDomancode(enuu, emcode);
|
|
|
workSchedule.setTask(task);
|
|
workSchedule.setTask(task);
|
|
|
workSchedule.setOutPlan(planInfos);
|
|
workSchedule.setOutPlan(planInfos);
|
|
|
map.put("me", workSchedule);
|
|
map.put("me", workSchedule);
|
|
@@ -113,7 +113,7 @@ public class WorkScheduleServiceImpl implements WorkScheduleService {
|
|
|
List<OfficeTask> othTasks = new ArrayList<OfficeTask>();
|
|
List<OfficeTask> othTasks = new ArrayList<OfficeTask>();
|
|
|
if (!CollectionUtils.isEmpty(tasks)) {
|
|
if (!CollectionUtils.isEmpty(tasks)) {
|
|
|
for (OfficeTask ta : tasks) {
|
|
for (OfficeTask ta : tasks) {
|
|
|
- if (!ta.getRecordercode().equals(emcode)) {
|
|
|
|
|
|
|
+ if (!ta.getDomancode().equals(emcode)) {
|
|
|
othTasks.add(ta);
|
|
othTasks.add(ta);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|