Skip to content

Commit c98ac19

Browse files
committed
fix: source contract approval config
--story=1020864@tapd-34675357 --user=陈建星 【运营】报价/合同 审批配置启用开关 https://www.tapd.cn/34675357/s/1852298
1 parent b27c6bf commit c98ac19

File tree

1 file changed

+12
-6
lines changed

1 file changed

+12
-6
lines changed

backend/crm/src/main/java/cn/cordys/crm/contract/service/ContractService.java

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import cn.cordys.common.util.BeanUtils;
2525
import cn.cordys.common.util.JSON;
2626
import cn.cordys.common.util.Translator;
27+
import cn.cordys.context.OrganizationContext;
2728
import cn.cordys.crm.contract.constants.ContractApprovalStatus;
2829
import cn.cordys.crm.contract.constants.ContractStage;
2930
import cn.cordys.crm.contract.domain.Contract;
@@ -41,6 +42,7 @@
4142
import cn.cordys.crm.system.constants.DictModule;
4243
import cn.cordys.crm.system.constants.NotificationConstants;
4344
import cn.cordys.crm.system.domain.MessageTaskConfig;
45+
import cn.cordys.crm.system.dto.DictConfigDTO;
4446
import cn.cordys.crm.system.dto.MessageTaskConfigDTO;
4547
import cn.cordys.crm.system.dto.field.SerialNumberField;
4648
import cn.cordys.crm.system.dto.field.base.BaseField;
@@ -57,6 +59,7 @@
5759
import com.github.pagehelper.PageHelper;
5860
import jakarta.annotation.Resource;
5961
import org.apache.commons.collections.CollectionUtils;
62+
import org.apache.commons.lang3.BooleanUtils;
6063
import org.apache.commons.lang3.StringUtils;
6164
import org.apache.commons.lang3.Strings;
6265
import org.apache.ibatis.session.ExecutorType;
@@ -778,12 +781,15 @@ public List<FilterCondition> getDefaultSourceFilters() {
778781
// 只展示状态为通过且非作废/归档阶段的合同
779782
List<FilterCondition> conditions = new ArrayList<>();
780783

781-
FilterCondition statusCondition = new FilterCondition();
782-
statusCondition.setMultipleValue(false);
783-
statusCondition.setName("approvalStatus");
784-
statusCondition.setOperator(FilterCondition.CombineConditionOperator.IN.name());
785-
statusCondition.setValue(List.of(ContractApprovalStatus.APPROVED.name()));
786-
conditions.add(statusCondition);
784+
DictConfigDTO dictConf = dictService.getDictConf(DictModule.CONTRACT_APPROVAL.name(), OrganizationContext.getOrganizationId());
785+
if (dictConf != null && BooleanUtils.isTrue(dictConf.getEnable())) {
786+
FilterCondition statusCondition = new FilterCondition();
787+
statusCondition.setMultipleValue(false);
788+
statusCondition.setName("approvalStatus");
789+
statusCondition.setOperator(FilterCondition.CombineConditionOperator.IN.name());
790+
statusCondition.setValue(List.of(ContractApprovalStatus.APPROVED.name()));
791+
conditions.add(statusCondition);
792+
}
787793

788794
FilterCondition stageCondition = new FilterCondition();
789795
stageCondition.setMultipleValue(false);

0 commit comments

Comments
 (0)