记得上下班打卡 | git大法好,push需谨慎

Commit a192eef2 authored by 胡佳晨's avatar 胡佳晨

Merge remote-tracking branch 'origin/dev' into dev

parents e2e15453 281332e0
...@@ -267,7 +267,7 @@ public class AdamRdmService { ...@@ -267,7 +267,7 @@ public class AdamRdmService {
} }
public AdamEntersVo getEntersVoByUidEntersId(List<AdamEntersVo> vos, String entersId) { public AdamEntersVo getEntersVoByUidEntersId(List<AdamEntersVo> vos, String entersId) {
if (CollectionUtils.isEmpty(vos)) { if (!CollectionUtils.isEmpty(vos)) {
return vos.stream().filter(r -> r.getEntersId().equals(entersId)).findAny().orElse(null); return vos.stream().filter(r -> r.getEntersId().equals(entersId)).findAny().orElse(null);
} }
return null; return null;
...@@ -327,7 +327,7 @@ public class AdamRdmService { ...@@ -327,7 +327,7 @@ public class AdamRdmService {
} }
public AdamAddressesVo getAddressesVoByUidAddressesId(List<AdamAddressesVo> vos, String addressesId) { public AdamAddressesVo getAddressesVoByUidAddressesId(List<AdamAddressesVo> vos, String addressesId) {
if (CollectionUtils.isEmpty(vos)) { if (!CollectionUtils.isEmpty(vos)) {
return vos.stream().filter(r -> r.getAddressesId().equals(addressesId)).findAny().orElse(null); return vos.stream().filter(r -> r.getAddressesId().equals(addressesId)).findAny().orElse(null);
} }
return null; return null;
......
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