|
@@ -961,7 +961,7 @@ public class CheckLargeScreenServiceImpl implements ICheckLargeScreenService {
|
|
961
|
all.forEach(item -> {
|
961
|
all.forEach(item -> {
|
|
962
|
if (ObjectUtil.isNull(item.getCheckedDepartmentId())) {
|
962
|
if (ObjectUtil.isNull(item.getCheckedDepartmentId())) {
|
|
963
|
item.setCheckedDepartmentId(deptIdMap.getOrDefault(item.getCheckedTeamId(), 0L));
|
963
|
item.setCheckedDepartmentId(deptIdMap.getOrDefault(item.getCheckedTeamId(), 0L));
|
|
964
|
- item.setCheckedTeamName(deptMap.getOrDefault(item.getCheckedDepartmentId(), ""));
|
|
|
|
|
|
964
|
+ item.setCheckedDepartmentName(deptMap.getOrDefault(item.getCheckedDepartmentId(), ""));
|
|
965
|
}
|
965
|
}
|
|
966
|
});
|
966
|
});
|
|
967
|
}
|
967
|
}
|
|
@@ -1632,7 +1632,7 @@ public class CheckLargeScreenServiceImpl implements ICheckLargeScreenService {
|
|
1632
|
all.forEach(item -> {
|
1632
|
all.forEach(item -> {
|
|
1633
|
if (ObjectUtil.isNull(item.getCheckedDepartmentId())) {
|
1633
|
if (ObjectUtil.isNull(item.getCheckedDepartmentId())) {
|
|
1634
|
item.setCheckedDepartmentId(deptIdMap.getOrDefault(item.getCheckedTeamId(), 0L));
|
1634
|
item.setCheckedDepartmentId(deptIdMap.getOrDefault(item.getCheckedTeamId(), 0L));
|
|
1635
|
- item.setCheckedTeamName(deptMap.getOrDefault(item.getCheckedDepartmentId(), ""));
|
|
|
|
|
|
1635
|
+ item.setCheckedDepartmentName(deptMap.getOrDefault(item.getCheckedDepartmentId(), ""));
|
|
1636
|
}
|
1636
|
}
|
|
1637
|
});
|
1637
|
});
|
|
1638
|
}
|
1638
|
}
|
|
@@ -1718,7 +1718,7 @@ public class CheckLargeScreenServiceImpl implements ICheckLargeScreenService {
|
|
1718
|
all.forEach(item -> {
|
1718
|
all.forEach(item -> {
|
|
1719
|
if (ObjectUtil.isNull(item.getCheckedDepartmentId())) {
|
1719
|
if (ObjectUtil.isNull(item.getCheckedDepartmentId())) {
|
|
1720
|
item.setCheckedDepartmentId(deptIdMap.getOrDefault(item.getCheckedTeamId(), 0L));
|
1720
|
item.setCheckedDepartmentId(deptIdMap.getOrDefault(item.getCheckedTeamId(), 0L));
|
|
1721
|
- item.setCheckedTeamName(deptMap.getOrDefault(item.getCheckedDepartmentId(), ""));
|
|
|
|
|
|
1721
|
+ item.setCheckedDepartmentName(deptMap.getOrDefault(item.getCheckedDepartmentId(), ""));
|
|
1722
|
}
|
1722
|
}
|
|
1723
|
});
|
1723
|
});
|
|
1724
|
}
|
1724
|
}
|
|
@@ -1912,7 +1912,7 @@ public class CheckLargeScreenServiceImpl implements ICheckLargeScreenService {
|
|
1912
|
all.forEach(item -> {
|
1912
|
all.forEach(item -> {
|
|
1913
|
if (ObjectUtil.isNull(item.getCheckedDepartmentId())) {
|
1913
|
if (ObjectUtil.isNull(item.getCheckedDepartmentId())) {
|
|
1914
|
item.setCheckedDepartmentId(deptIdMap.getOrDefault(item.getCheckedTeamId(), 0L));
|
1914
|
item.setCheckedDepartmentId(deptIdMap.getOrDefault(item.getCheckedTeamId(), 0L));
|
|
1915
|
- item.setCheckedTeamName(deptMap.getOrDefault(item.getCheckedDepartmentId(), ""));
|
|
|
|
|
|
1915
|
+ item.setCheckedDepartmentName(deptMap.getOrDefault(item.getCheckedDepartmentId(), ""));
|
|
1916
|
}
|
1916
|
}
|
|
1917
|
});
|
1917
|
});
|
|
1918
|
}
|
1918
|
}
|