From 88b1b899f25d00b532a1fd286d5599db48c76edc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com>
Date: Thu, 2 Apr 2020 18:44:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=EF=BC=8C=E7=88=B1?=
 =?UTF-8?q?=E5=BF=83=E4=BA=92=E5=8A=A9=EF=BC=8C=E5=B7=B2=E6=8A=A5=E5=90=8D?=
 =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=9A=84=E5=B7=B2=E9=80=9A=E8=BF=87=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E4=B8=AD=EF=BC=8C=E5=B8=A6=E6=9C=89=E5=BF=97=E6=84=BF?=
 =?UTF-8?q?=E8=80=85=E6=89=93=E5=8D=A1=E7=9A=84=E6=B4=BB=E5=8A=A8=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=85=A8=E9=83=A8=E6=B2=A1=E6=9C=89=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/activity/controller/AppActInfoController.java   | 2 +-
 .../src/main/resources/mapper/activity/ActInfoDao.xml       | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/AppActInfoController.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/AppActInfoController.java
index c482222f2..406f84dcd 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/AppActInfoController.java
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/AppActInfoController.java
@@ -81,7 +81,7 @@ public class AppActInfoController {
         return this.actInfoService.signupListItemsByApp(formDto);
     }
     /**
-     * 项目详情--工作端
+     * 项目详情--移动端
      * @Params: [id]
      * @Return: com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.item.result.ItemDetailResultDTO>
      * @Author: lipengfei
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActInfoDao.xml b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActInfoDao.xml
index aee142623..ce0881eda 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActInfoDao.xml
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActInfoDao.xml
@@ -239,7 +239,11 @@
             or actInfo.ACT_STATUS = '0' and relation.USER_ID = #{userId}
         </if>
         <if test='actType != null and actType != "" and actType != "5"'>
-            AND relation.STATUS = #{actType}
+            AND (relation.STATUS = #{actType}
+            <if test='actType == "1"'>
+                OR relation.STATUS = '2'
+            </if>
+            )
             and actInfo.ACT_STATUS = '1'
         </if>
         ORDER BY