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 * @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} - AND relation.STATUS = #{actType} + AND (relation.STATUS = #{actType} + + OR relation.STATUS = '2' + + ) and actInfo.ACT_STATUS = '1' ORDER BY