Explorar o código

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

lipf hai 4 meses
pai
achega
4376320bbb

+ 5 - 2
tenant/organization/src/main/java/com/jzg/organization/service/impl/SysUserJzgInfoBankCardServiceImpl.java

@@ -79,8 +79,11 @@ public class SysUserJzgInfoBankCardServiceImpl extends ServiceImpl<SysUserJzgInf
             sysUserJzgInfoBankCardDto.setSysUserJzgInfoBankCardRecordList(sysUserJzgInfoBankCardRecordList);
             sysUserJzgInfoBankCardDto.setSysUserJzgInfoBankCardRecordList(sysUserJzgInfoBankCardRecordList);
             // 填充最新的驳回日期和驳回原因
             // 填充最新的驳回日期和驳回原因
             if(CollUtil.isNotEmpty(sysUserJzgInfoBankCardRecordList)){
             if(CollUtil.isNotEmpty(sysUserJzgInfoBankCardRecordList)){
-                List<SysUserJzgInfoBankCardRecord> list = sysUserJzgInfoBankCardRecordList.stream().filter(action -> "2".equals(action.getStatus()))
-                        .sorted(Comparator.comparing(SysUserJzgInfoBankCardRecord::getCreateTime)).toList();
+                // 过滤出状态=2的驳回记录,并按创建时间 倒序排列
+                List<SysUserJzgInfoBankCardRecord> list = sysUserJzgInfoBankCardRecordList.stream()
+                        .filter(action -> "2".equals(action.getStatus()))
+                        .sorted(Comparator.comparing(SysUserJzgInfoBankCardRecord::getCreateTime).reversed())
+                        .toList();
                 if(CollUtil.isNotEmpty(list)){
                 if(CollUtil.isNotEmpty(list)){
                     SysUserJzgInfoBankCardRecord sysUserJzgInfoBankCardRecord = list.get(0);
                     SysUserJzgInfoBankCardRecord sysUserJzgInfoBankCardRecord = list.get(0);
                     if(sysUserJzgInfoBankCardRecord != null){
                     if(sysUserJzgInfoBankCardRecord != null){