Commit 0d4c5114 by 谢春璐

fix

parent d4ad2bb3
......@@ -23,7 +23,7 @@ public class Staff {
/**
* 部门
*/
private String department;
private String department = "";
/**
* 出勤列表
......
......@@ -274,8 +274,11 @@ public class FileServiceImpl implements FileService {
List<Staff> value = staffEntry.getValue();
List<WorkCheck> workChecks = new ArrayList<>();
List<Staff> staffList1 = value.stream().filter(staff1 -> StringUtils.isNotBlank(staff1.getDepartment()))
.collect(Collectors.toList());
staff.setDepartment(staffList1.size() > 0 ? staffList1.get(0).getDepartment() : "");
value.forEach(s -> {
staff.setDepartment(s.getDepartment());
workChecks.addAll(s.getWorkCheckList());
}
);
......
......@@ -13,10 +13,7 @@
<div class="row align-items-center">
<table class="table table-bordered">
<tbody>
<!--<tr>
<th scope="row">打卡机考勤记录:</th>
<td><input type="file" name="file"/></td>
</tr>-->
<tr>
<th scope="row">企业微信上下班打卡记录:</th>
<td><input type="file" name="file"/></td>
......@@ -25,10 +22,14 @@
<th scope="row">企业微信外出打卡记录:</th>
<td><input type="file" name="file"/></td>
</tr>
<!--<tr>-->
<!--<th scope="row">钉钉打卡记录:</th>-->
<!--<td><input type="file" name="file"/></td>-->
<!--</tr>-->
<tr>
<th scope="row">打卡机考勤记录:</th>
<td><input type="file" name="file"/></td>
</tr>
<tr>
<th scope="row">钉钉打卡记录:</th>
<td><input type="file" name="file"/></td>
</tr>
</tbody>
</table>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment