|
@@ -3,6 +3,7 @@ package com.persagy.dmp.rwd.digital.service.impl;
|
|
|
import cn.hutool.core.bean.BeanUtil;
|
|
|
import cn.hutool.core.collection.CollUtil;
|
|
|
import cn.hutool.core.date.DateUtil;
|
|
|
+import cn.hutool.core.util.BooleanUtil;
|
|
|
import cn.hutool.core.util.NumberUtil;
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
@@ -286,7 +287,8 @@ public class RelationCalServiceImpl implements RelationCalService {
|
|
|
.mainContent(requestData.getMainContent())
|
|
|
.slaveContent(requestData.getSlaveContent())
|
|
|
.relValue(requestData.getRelValue())
|
|
|
- .calBeforeRelFlag(requestData.getCalBeforeRelFlag())
|
|
|
+ .calBeforeRelFlag(null==requestData.getCalBeforeRelFlag()?Boolean.FALSE:requestData.getCalBeforeRelFlag())
|
|
|
+ .filterRelFlag(Boolean.TRUE)
|
|
|
.groupCode(AppContext.getContext().getGroupCode())
|
|
|
.projectId(AppContext.getContext().getProjectId())
|
|
|
.appId(AppContext.getContext().getAppId())
|