by2025/SmartParks
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

master #13

Merged
lsm merged 5 commits from master into prod 2025-09-17 17:05:48 +08:00
Conversation 0 Commits 5 Files Changed 3 +1 -1
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit bfada06cfe - Show all commits

2
ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MeetBookingServiceImpl.java
View File

@@ -212,7 +212,7 @@ public class MeetBookingServiceImpl implements IMeetBookingService {
}
if (CollUtil.isNotEmpty(remoteUserVos)) {
ResidentPersonVo residentPersonVo = remoteUserVos.stream()
.filter(vo -> vo.getUserId() != null && String.valueOf(vo.getUserId()).equals(s.getPerson())).findFirst().orElse(null);
.filter(vo -> vo.getId() != null && String.valueOf(vo.getId()).equals(s.getPerson())).findFirst().orElse(null);
s.setPersonName(ObjectUtil.isNotEmpty(residentPersonVo) ? residentPersonVo.getUserName() : null);
}
String str = df.format(s.getScheduledStarttime());