fixed translate

src/main/java/cn/cslg/pas/service/business/es/EsService.java

@@ -351,9 +351,11 @@ public class EsService {
     public PatentColumnDTO getPatentColumnDTO(Patent patent, Integer projectId, String id) {
         PatentColumnDTO columnDTO = new PatentColumnDTO();
         BeanUtils.copyProperties(patent, columnDTO);
-        boolean b = patent.getIpc().stream().allMatch(Objects::isNull);
-        if (b) {
-            columnDTO.setIpc(new ArrayList<>());
+        if (!CollectionUtils.isEmpty(patent.getIpc())){
+            boolean b = patent.getIpc().stream().allMatch(Objects::isNull);
+            if (b) {
+                columnDTO.setIpc(new ArrayList<>());
+            }
         }
         if (projectId != null) {
             try {

src/main/java/cn/cslg/pas/service/common/TranslateService.java

@@ -177,7 +177,7 @@ public class TranslateService {
         }
         //译文
         String translateContent = this.getTranslateContent(textContent);
-        String s1 = this.loadingTranslate(patentNo, patentField, text.getLanguage(), false, 0, "-1", translateContent);
+        String s1 = this.loadingTranslate(patentNo, patentField, "CN", false, 0, "-1", translateContent);
         if (StringUtils.isNotEmpty(s1)) {
             i += 1;
         }
@@ -302,6 +302,10 @@ public class TranslateService {
                 params.setCountry(text.getLanguage());
                 List<RePatentClaim> rePatentClaims = ClaimSplitUtils.formatPatentRight(params);
                 for (RePatentClaim rePatentClaim : rePatentClaims) {
+                    if (rePatentClaim.getContent().contains("&nbsp;")) {
+                        String replace = rePatentClaim.getContent().replace("&nbsp;", " ");
+                        rePatentClaim.setContent(replace);
+                    }
                     //原文
                     String s = this.loadingTranslate(patentNo, patentField, text.getLanguage(), true,
                             rePatentClaim.getSort(), rePatentClaim.getParentSort(), rePatentClaim.getContent());
@@ -383,7 +387,7 @@ public class TranslateService {
                     if (fVO != null) {
                         TranslateVO translateVO = new TranslateVO();
                         translateVO.setPatentNo(tVO.getPatentNo());
-                        translateVO.setLanguage(fVO.getLanguage());
+                        translateVO.setLanguage(tVO.getLanguage());
                         translateVO.setPatentField(tVO.getPatentField());
                         translateVO.setOriginalContent(tVO.getOriginalContent());
                         translateVO.setParentSort(tVO.getParentSort());
@@ -412,7 +416,7 @@ public class TranslateService {
             for (EsTranslateDTO translateDTO : translateDTOS) {
                 Content content = translateDTO.getContent();
                 String translateContent = this.getTranslateContent(content.getTextContent());
-                String s = this.loadingTranslate(translateDTO.getPatentNo(), translateDTO.getPatentField(), translateDTO.getLanguage(), false,
+                String s = this.loadingTranslate(translateDTO.getPatentNo(), translateDTO.getPatentField(), "CN", false,
                         content.getOrder(), content.getParentSort(), translateContent);
                 if (StringUtils.isNotEmpty(s)) {
                     i++;