|
@@ -3198,7 +3198,6 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
|
|
|
Integer corpwxDeptId = (Integer) data.get("corpwxDeptId");
|
|
|
Map<String, Object> map = new HashMap<>();
|
|
|
String date = new SimpleDateFormat("yyyy-MM-dd").format((Date)data.get("createDate"));
|
|
|
- String corpwxUserid = (String) data.get("corpwxUserId");
|
|
|
map.put("workingTime", data.get("workingTime"));
|
|
|
map.put("createDate", date);
|
|
|
if (id.equals(lastUserId)) {
|
|
@@ -3210,7 +3209,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
|
|
|
lastUserData.userId = id;
|
|
|
lastUserData.name = name;
|
|
|
lastUserData.departmentName = departmentName;
|
|
|
- lastUserData.corpwxUserId = departmentName;
|
|
|
+ lastUserData.corpwxUserId = corpwxUserId;
|
|
|
lastUserData.corpwxDeptId = departmentName;
|
|
|
lastUserData.worktimeList = new ArrayList<>();
|
|
|
lastUserData.worktimeList.add(map);
|