From abe815efa7fddd20f958b69b77d02bcc92d0bb84 Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期三, 18 八月 2021 18:28:43 +0800
Subject: [PATCH] 下载安全工作记录报告

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java |   18 +++++++-----------
 1 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java
index fc9edcd..53d8f20 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java
@@ -217,19 +217,15 @@
     public ComActActivityVO inforActivity(Long id, Long userId) {
         ComActActivityVO comActActivityVO=comActActivityDAO.inforActivity(id);
         if (!ObjectUtils.isEmpty(comActActivityVO)) {
-
-            LambdaQueryWrapper<ComActActSignDO> actSignQuery = new LambdaQueryWrapper<>();
-            actSignQuery.eq(ComActActSignDO::getActivityId, id);
             if(userId != null){
+                LambdaQueryWrapper<ComActActSignDO> actSignQuery = new LambdaQueryWrapper<>();
+                actSignQuery.eq(ComActActSignDO::getActivityId, id);
                 actSignQuery.eq(ComActActSignDO::getUserId, userId);
-            }
-
-            ComActActSignDO comActActSignDO = comActActSignDAO.selectOne(actSignQuery);
-            if (!ObjectUtils.isEmpty(comActActSignDO)) {
-                comActActivityVO.setIsSign(1);
-                comActActivityVO.setIsVolunteer(comActActSignDO.getIsVolunteer());
-            }else {
-
+                ComActActSignDO comActActSignDO = comActActSignDAO.selectOne(actSignQuery);
+                if (!ObjectUtils.isEmpty(comActActSignDO)) {
+                    comActActivityVO.setIsSign(1);
+                    comActActivityVO.setIsVolunteer(comActActSignDO.getIsVolunteer());
+                }
             }
         }
         return comActActivityVO;

--
Gitblit v1.7.1