活动报名接口bug修改

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserRelationServiceImpl.java

@@ -168,7 +168,7 @@ public class ActUserRelationServiceImpl extends BaseServiceImpl<ActUserRelationD
         //查询是否已报名
         ActUserRelationEntity actUserRelationEntity = baseDao.selectOneByUserIdAndActId(actUserRelationDTO.getUserId(), actUserRelationDTO.getActId());
         if (null == actUserRelationEntity || (ActUserRelationStatusConstant.CANCEL_SIGN_UP.equals(actUserRelationEntity.getStatus())
-                && ActUserRelationStatusConstant.NOT_APPROVED.equals(actUserRelationEntity.getStatus()))) {
+                || ActUserRelationStatusConstant.NOT_APPROVED.equals(actUserRelationEntity.getStatus()))) {
             //未报名该活动，进行报名
             //存储活动人员关系表
             ActUserRelationEntity entity = ConvertUtils.sourceToTarget(actUserRelationDTO, ActUserRelationEntity.class);
@@ -207,7 +207,7 @@ public class ActUserRelationServiceImpl extends BaseServiceImpl<ActUserRelationD
             updateById(entity);
             //存储活动日志表
             ActUserLogDTO actUserLogDTO = new ActUserLogDTO();
-            actUserLogDTO.setActUserRelationId(actUserRelationDTO.getActId());
+            actUserLogDTO.setActUserRelationId(actUserRelationDTO.getId());
             actUserLogDTO.setOperationType(ActUserRelationStatusConstant.CANCEL_SIGN_UP);//取消报名
             actUserLogDTO.setOperationTime(new Date());
             actUserLogDTO.setFailureReason(appActUserCancelsignupDTO.getFailureReason());