Merge branch 'test' into dev

# Conflicts:
#	PAS/src/main/java/cn/cslg/pas/service/PatentRightService.java

PAS/src/main/java/cn/cslg/pas/service/PatentRightService.java

@@ -439,15 +439,13 @@ public class PatentRightService extends ServiceImpl<PatentRightMapper, PatentRig
         //权利要求
         String content = params.getContent();
         if(content!=null) {
-            content = content.replaceAll("\n", "");
-            content = content.replaceAll("\r", "");
+            content = content.trim();
         }
         //权利要求(译)
+
         String contentOut = params.getContentOut();
         if(contentOut!=null){
-            contentOut =contentOut.replaceAll("\n","");
-            contentOut =contentOut.replaceAll("\r","");
-        }
+        contentOut =contentOut.trim();}
         //独立权利要求
         String selfContent = params.getSelfContent();
         if (StringUtils.isNotEmpty(content)) {
@@ -460,11 +458,17 @@ public class PatentRightService extends ServiceImpl<PatentRightMapper, PatentRig
                 case "CN":
                     code = "。";
                     if (StringUtils.isNotEmpty(contentOut)) {
+                        contentOut = contentOut.replaceAll("\n", "");
+                        content = content.replaceAll("\r","");
                         contentOutArray = StringUtils.split(contentOut, code);
                     }
                     if (StringUtils.isNotEmpty(selfContent)) {
+                        selfContent = selfContent.replaceAll("\n", "");
+                        content = content.replaceAll("\r","");
                         selfContentArray = StringUtils.split(selfContent, code);
                     }
+                    content = content.replaceAll("\n", "");
+                    content = content.replaceAll("\r","");
                     contentArray = StringUtils.split(content, code);
                     break;
                 default: