企业高管 合并+审核 bug修改

src/main/java/com/zzsn/leaderbase/service/impl/CharacterBasicInfoServiceImpl.java

@@ -33,6 +33,7 @@ import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
@@ -60,6 +61,9 @@ import java.util.stream.Collectors;
 @Service
 public class CharacterBasicInfoServiceImpl extends ServiceImpl<CharacterBasicInfoMapper, CharacterBasicInfo> implements CharacterBasicInfoService {
 
+    @Value("${caiji.syncUrl:http://1.95.79.85:8824/subjectProject/enterprise/api/personnelUpdate}")
+    private String syncUrl;
+
     //生成id
     @Autowired
     IGeneratorIdService generatorIdService;
@@ -107,7 +111,7 @@ public class CharacterBasicInfoServiceImpl extends ServiceImpl<CharacterBasicInf
             }
             ExecutiveNew executive = SyncUtil.convertToCaiji(basicInfo);
             log.info("同步高管信息到采集中心：{}", com.alibaba.fastjson2.JSON.toJSONString(executive));
-            String post = HttpUtil.post("http://1.95.79.85:8824/subjectProject/enterprise/api/personnelUpdate", com.alibaba.fastjson2.JSON.toJSONString(executive));
+            String post = HttpUtil.post(syncUrl, com.alibaba.fastjson2.JSON.toJSONString(executive));
             log.info("同步高管信息到采集中心结果：{}", post);
         }catch (Exception e){
             log.error("同步高管信息到采集中心异常：{}", e.getMessage());

src/main/java/com/zzsn/leaderbase/service/impl/CharacterExtractInfoServiceImpl.java

@@ -112,6 +112,7 @@ public class CharacterExtractInfoServiceImpl extends ServiceImpl<CharacterExtrac
         //相同 更新
         if(checkSimilarPerson(suspectedInfo,character)){
             opFlag =synCharacterBasicInfo(character,suspectedId);
+            character.setUid(uid );
         }else{//新建人物信息
             character=convertCharacter(character,extractInfo);
             character.setUid(uid );