|
@@ -1049,7 +1049,9 @@ public class WebMediatorImpl implements ViewMediator {
|
|
BeanUtils.copyProperties(evaluationAgencyPO, agency);
|
|
BeanUtils.copyProperties(evaluationAgencyPO, agency);
|
|
return new BaseAuthVO(agency);
|
|
return new BaseAuthVO(agency);
|
|
}).collect(Collectors.toList()));
|
|
}).collect(Collectors.toList()));
|
|
- authingList.sort(Comparator.comparing(BaseAuthVO::getApplytime).reversed());
|
|
|
|
|
|
+ if(authingList.size() > 0 && authingList != null) {
|
|
|
|
+ authingList.sort(Comparator.comparing(BaseAuthVO::getApplytime).reversed());
|
|
|
|
+ }
|
|
return authingList;
|
|
return authingList;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -1062,18 +1064,20 @@ public class WebMediatorImpl implements ViewMediator {
|
|
return new BaseAuthVO(personalAuthentication);
|
|
return new BaseAuthVO(personalAuthentication);
|
|
}).collect(Collectors.toList()));
|
|
}).collect(Collectors.toList()));
|
|
|
|
|
|
- authingList.addAll(enterpriseAuthenticationDao.findByIsAuthenticationIsNot(AuthenticationStatus.isAuthenIng).stream().map(enterpriseAuthenticationPO -> {
|
|
|
|
- EnterpriseAuthentication enterpriseAuthentication = new EnterpriseAuthentication();
|
|
|
|
- BeanUtils.copyProperties(enterpriseAuthenticationPO, enterpriseAuthentication);
|
|
|
|
- return new BaseAuthVO(enterpriseAuthentication);
|
|
|
|
- }).collect(Collectors.toList()));
|
|
|
|
|
|
+// authingList.addAll(enterpriseAuthenticationDao.findByIsAuthenticationIsNot(AuthenticationStatus.isAuthenIng).stream().map(enterpriseAuthenticationPO -> {
|
|
|
|
+// EnterpriseAuthentication enterpriseAuthentication = new EnterpriseAuthentication();
|
|
|
|
+// BeanUtils.copyProperties(enterpriseAuthenticationPO, enterpriseAuthentication);
|
|
|
|
+// return new BaseAuthVO(enterpriseAuthentication);
|
|
|
|
+// }).collect(Collectors.toList()));
|
|
|
|
|
|
authingList.addAll(agencyDao.findByIsAuthenticationIsNot(AuthenticationStatus.isAuthenIng).stream().map(evaluationAgencyPO -> {
|
|
authingList.addAll(agencyDao.findByIsAuthenticationIsNot(AuthenticationStatus.isAuthenIng).stream().map(evaluationAgencyPO -> {
|
|
EvaluationAgency agency = new EvaluationAgency();
|
|
EvaluationAgency agency = new EvaluationAgency();
|
|
BeanUtils.copyProperties(evaluationAgencyPO, agency);
|
|
BeanUtils.copyProperties(evaluationAgencyPO, agency);
|
|
return new BaseAuthVO(agency);
|
|
return new BaseAuthVO(agency);
|
|
}).collect(Collectors.toList()));
|
|
}).collect(Collectors.toList()));
|
|
- authingList.sort(Comparator.comparing(BaseAuthVO::getApplytime).reversed());
|
|
|
|
|
|
+ if(authingList.size() > 0 && authingList != null){
|
|
|
|
+ authingList.sort(Comparator.comparing(BaseAuthVO::getApplytime).reversed());
|
|
|
|
+ }
|
|
return authingList;
|
|
return authingList;
|
|
|
|
|
|
}
|
|
}
|