|
24 | 24 | import cn.cordys.common.util.BeanUtils; |
25 | 25 | import cn.cordys.common.util.JSON; |
26 | 26 | import cn.cordys.common.util.Translator; |
| 27 | +import cn.cordys.context.OrganizationContext; |
27 | 28 | import cn.cordys.crm.contract.constants.ContractApprovalStatus; |
28 | 29 | import cn.cordys.crm.contract.constants.ContractStage; |
29 | 30 | import cn.cordys.crm.contract.domain.Contract; |
|
41 | 42 | import cn.cordys.crm.system.constants.DictModule; |
42 | 43 | import cn.cordys.crm.system.constants.NotificationConstants; |
43 | 44 | import cn.cordys.crm.system.domain.MessageTaskConfig; |
| 45 | +import cn.cordys.crm.system.dto.DictConfigDTO; |
44 | 46 | import cn.cordys.crm.system.dto.MessageTaskConfigDTO; |
45 | 47 | import cn.cordys.crm.system.dto.field.SerialNumberField; |
46 | 48 | import cn.cordys.crm.system.dto.field.base.BaseField; |
|
57 | 59 | import com.github.pagehelper.PageHelper; |
58 | 60 | import jakarta.annotation.Resource; |
59 | 61 | import org.apache.commons.collections.CollectionUtils; |
| 62 | +import org.apache.commons.lang3.BooleanUtils; |
60 | 63 | import org.apache.commons.lang3.StringUtils; |
61 | 64 | import org.apache.commons.lang3.Strings; |
62 | 65 | import org.apache.ibatis.session.ExecutorType; |
@@ -778,12 +781,15 @@ public List<FilterCondition> getDefaultSourceFilters() { |
778 | 781 | // 只展示状态为通过且非作废/归档阶段的合同 |
779 | 782 | List<FilterCondition> conditions = new ArrayList<>(); |
780 | 783 |
|
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 | + } |
787 | 793 |
|
788 | 794 | FilterCondition stageCondition = new FilterCondition(); |
789 | 795 | stageCondition.setMultipleValue(false); |
|
0 commit comments