From 4a697b66a554f84f26ebcf17e8e3c05e827ee8ef Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期一, 11 四月 2022 13:56:22 +0800
Subject: [PATCH] Merge branch 'huacheng' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into huacheng

---
 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java
index d596283..8324dee 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java
@@ -339,7 +339,7 @@
                     Integer limit = comActActivityVO.getLimit();
                     if(limit != null && limit>0 &&currentList.size()>0){
                         if(comActActivityVO.getType()==3){
-                            if(limit==currentList.size()||currentList.get(currentList.size()-1).getEndTime()!=null){
+                            if(limit==currentList.size()&&currentList.get(currentList.size()-1).getEndTime()!=null){
                                 comActActivityVO.setIsRegist(1);
                             }
                         }

--
Gitblit v1.7.1