Merge branch 'master_after20' into master_cj_zq

@@ -62,7 +62,6 @@ public class ContractFrameworkServiceImpl extends BaseMpServiceImpl<ContractFram
         return getBaseMapper().query(vo);
     }
 
-    @Cacheable(value = ContractFramework.CACHE_NAME, key = "@cacheVariables.tenantId() + #id", unless = "#result == null")
     @Override
     public ContractFramework findById(String id) {
 
@@ -77,6 +76,19 @@ public class ContractFrameworkServiceImpl extends BaseMpServiceImpl<ContractFram
         if (ObjectUtil.isNull(data)) {
             throw new DefaultClientException("合同框架不存在！");
         }
+        QueryContractFrameworkVo vo1 = new QueryContractFrameworkVo();
+        vo1.setCustomerId(vo.getCustomerId());
+        vo1.setCompany(vo.getCompany());
+        vo1.setMaterialTypeId(vo.getMaterialTypeId());
+        List<ContractFramework> query = this.query(vo1);
+        if (CollectionUtils.isNotEmpty(query)) {
+            // 过滤掉当前 ID 的记录，看是否还有其他记录
+            boolean hasOtherRecords = query.stream()
+                    .anyMatch(item -> !item.getId().equals(vo.getId()));
+            if (hasOtherRecords) {
+                throw new DefaultClientException("已经存在相同的框架合同！");
+            }
+        }
 
         LambdaUpdateWrapper<ContractFramework> updateWrapper = Wrappers.lambdaUpdate(ContractFramework.class)
                 .set(ContractFramework::getCode, vo.getCode())
@@ -97,7 +109,14 @@ public class ContractFrameworkServiceImpl extends BaseMpServiceImpl<ContractFram
     @Transactional(rollbackFor = Exception.class)
     @Override
     public String create(CreateContractFrameworkVo vo) {
-
+        QueryContractFrameworkVo vo1 = new QueryContractFrameworkVo();
+        vo1.setCustomerId(vo.getCustomerId());
+        vo1.setCompany(vo.getCompany());
+        vo1.setMaterialTypeId(vo.getMaterialTypeId());
+        List<ContractFramework> query = this.query(vo1);
+        if (CollectionUtils.isNotEmpty(query)) {
+            throw new DefaultClientException("已经存在相同的框架合同！");
+        }
         ContractFramework data = new ContractFramework();
         data.setId(IdUtil.getId());
         data.setCode(vo.getCode());