From cca2e620b5dd406c22daf4054e72f79ae83e0dfc Mon Sep 17 00:00:00 2001
From: wkc <978997012@qq.com>
Date: Wed, 4 Feb 2026 19:45:05 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DintermediaryType?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E8=AE=BF=E9=97=AE=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- intermediaryType字段仅存在于VO中，不应在Entity上访问
- 移除查询条件中对getIntermediaryType()的错误引用
- 修改插入方法，使用正确的字段设置：
  - 个人中介：setPersonType('中介') + setDataSource
  - 实体中介：setRiskLevel('1') + setEntSource('INTERMEDIARY') + setDataSource
- 修复位置：查询条件、新增方法、导入方法共6处

编译验证：通过
---
 .../impl/CcdiIntermediaryServiceImpl.java     | 33 ++++++++++---------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiIntermediaryServiceImpl.java b/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiIntermediaryServiceImpl.java
index 82413e0..af77a30 100644
--- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiIntermediaryServiceImpl.java
+++ b/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiIntermediaryServiceImpl.java
@@ -55,12 +55,9 @@ public class CcdiIntermediaryServiceImpl implements ICcdiIntermediaryService {
 
         // 查询个人中介
         LambdaQueryWrapper<CcdiBizIntermediary> personWrapper = new LambdaQueryWrapper<>();
-        personWrapper.like(StringUtils.isNotEmpty(queryDTO.getName()), CcdiBizIntermediary::getName, queryDTO.getName())
-                .like(StringUtils.isNotEmpty(queryDTO.getCertificateNo()), CcdiBizIntermediary::getPersonId, queryDTO.getCertificateNo())
-                .eq(StringUtils.isNotEmpty(queryDTO.getIntermediaryType()), CcdiBizIntermediary::getIntermediaryType, queryDTO.getIntermediaryType())
-                .or()
-                .eq(StringUtils.isEmpty(queryDTO.getIntermediaryType()) || "1".equals(queryDTO.getIntermediaryType()),
-                        CcdiBizIntermediary::getIntermediaryType, "1");
+        personWrapper.eq(CcdiBizIntermediary::getPersonType, "中介")
+                .like(StringUtils.isNotEmpty(queryDTO.getName()), CcdiBizIntermediary::getName, queryDTO.getName())
+                .like(StringUtils.isNotEmpty(queryDTO.getCertificateNo()), CcdiBizIntermediary::getPersonId, queryDTO.getCertificateNo());
 
         List<CcdiBizIntermediary> personList = bizIntermediaryMapper.selectList(personWrapper);
         for (CcdiBizIntermediary person : personList) {
@@ -78,12 +75,10 @@ public class CcdiIntermediaryServiceImpl implements ICcdiIntermediaryService {
 
         // 查询实体中介
         LambdaQueryWrapper<CcdiEnterpriseBaseInfo> entityWrapper = new LambdaQueryWrapper<>();
-        entityWrapper.like(StringUtils.isNotEmpty(queryDTO.getName()), CcdiEnterpriseBaseInfo::getEnterpriseName, queryDTO.getName())
-                .like(StringUtils.isNotEmpty(queryDTO.getCertificateNo()), CcdiEnterpriseBaseInfo::getSocialCreditCode, queryDTO.getCertificateNo())
-                .eq(StringUtils.isNotEmpty(queryDTO.getIntermediaryType()), CcdiEnterpriseBaseInfo::getIntermediaryType, queryDTO.getIntermediaryType())
-                .or()
-                .eq(StringUtils.isEmpty(queryDTO.getIntermediaryType()) || "2".equals(queryDTO.getIntermediaryType()),
-                        CcdiEnterpriseBaseInfo::getIntermediaryType, "2");
+        entityWrapper.eq(CcdiEnterpriseBaseInfo::getRiskLevel, "1")
+                .eq(CcdiEnterpriseBaseInfo::getEntSource, "INTERMEDIARY")
+                .like(StringUtils.isNotEmpty(queryDTO.getName()), CcdiEnterpriseBaseInfo::getEnterpriseName, queryDTO.getName())
+                .like(StringUtils.isNotEmpty(queryDTO.getCertificateNo()), CcdiEnterpriseBaseInfo::getSocialCreditCode, queryDTO.getCertificateNo());
 
         List<CcdiEnterpriseBaseInfo> entityList = enterpriseBaseInfoMapper.selectList(entityWrapper);
         for (CcdiEnterpriseBaseInfo entity : entityList) {
@@ -164,7 +159,8 @@ public class CcdiIntermediaryServiceImpl implements ICcdiIntermediaryService {
 
         CcdiBizIntermediary person = new CcdiBizIntermediary();
         BeanUtils.copyProperties(addDTO, person);
-        person.setIntermediaryType("1");
+        person.setPersonType("中介");
+        person.setDataSource("MANUAL");
 
         return bizIntermediaryMapper.insert(person);
     }
@@ -209,7 +205,9 @@ public class CcdiIntermediaryServiceImpl implements ICcdiIntermediaryService {
 
         CcdiEnterpriseBaseInfo entity = new CcdiEnterpriseBaseInfo();
         BeanUtils.copyProperties(addDTO, entity);
-        entity.setIntermediaryType("2");
+        entity.setRiskLevel("1");
+        entity.setEntSource("INTERMEDIARY");
+        entity.setDataSource("MANUAL");
 
         return enterpriseBaseInfoMapper.insert(entity);
     }
@@ -318,7 +316,8 @@ public class CcdiIntermediaryServiceImpl implements ICcdiIntermediaryService {
                 // 转换为实体
                 CcdiBizIntermediary person = new CcdiBizIntermediary();
                 BeanUtils.copyProperties(excel, person);
-                person.setIntermediaryType("1");
+                person.setPersonType("中介");
+                person.setDataSource("IMPORT");
 
                 // 检查唯一性
                 if (!checkPersonIdUnique(excel.getPersonId(), null)) {
@@ -385,7 +384,9 @@ public class CcdiIntermediaryServiceImpl implements ICcdiIntermediaryService {
                 // 转换为实体
                 CcdiEnterpriseBaseInfo entity = new CcdiEnterpriseBaseInfo();
                 BeanUtils.copyProperties(excel, entity);
-                entity.setIntermediaryType("2");
+                entity.setRiskLevel("1");
+                entity.setEntSource("INTERMEDIARY");
+                entity.setDataSource("IMPORT");
 
                 // 检查唯一性
                 if (StringUtils.isNotEmpty(excel.getSocialCreditCode())) {