From 52e0ad7f25ca50e375bce10e47c9e30f3d39bdb2 Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期六, 04 九月 2021 16:27:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into txb
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveSubServiceImpl.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveSubServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveSubServiceImpl.java
index a745232..83b7e01 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveSubServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveSubServiceImpl.java
@@ -31,9 +31,14 @@
List<ComActReserveSubListVO> resultList = new ArrayList<>(100);
resultList.add(new ComActReserveSubListVO("nub","序号"));
resultList.add(new ComActReserveSubListVO("nickName","用户昵称"));
- List<ComActReserveSubListVO> list = this.baseMapper.getReserveSubjectList(reserveId);
- if(list != null && !list.isEmpty()){
- resultList.addAll(list);
+ List<ComActReserveSubListVO> subList = this.baseMapper.getReserveSubjectList(reserveId);
+ if(subList != null && !subList.isEmpty()){
+ subList.forEach(list -> {
+ if(!list.getType().equals(5)){
+ resultList.add(list);
+ }
+ });
+// resultList.addAll(list);
}
resultList.add(new ComActReserveSubListVO("id","登记流水"));
resultList.add(new ComActReserveSubListVO("time","登记时间"));
--
Gitblit v1.7.1