Merge branch 'test' into dev2

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

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

@@ -434,23 +434,51 @@ public class PatentRightService extends ServiceImpl<PatentRightMapper, PatentRig
      */
     public void updatePatentRight(PatentRightParams params) {
         try {
-            //调用拆分权要工具类
-            List<PatentRight> patentRights = PatentRightUtils.formatPatentRight(params);
 
-            if (patentRights.size() > 0) {
+            String content =params.getContent();
+            if (content != null && !content.equals(""))
+            {
                 PatentRight patentRight = new PatentRight()
                         .setPatentId(params.getPatentId())
                         .setType(1)
                         .setContent(params.getContent())
+                        .setContentOut(params.getContentOut())
                         .setSort(0)
                         .setParentSort("-1");
-                //TODO 先根据专利id查询库中原权要，与当前权要比对，若不同则更新，若相同则不更新
-
                 //删除库表中原有该权要
                 this.deleteByPatentId(params.getPatentId());
                 //权要数据入表"os_patent_right"
-                this.saveOrUpdateBatch(patentRights);
+                patentRight.insert();
             }
+            else{
+                PatentRight patentRight = new PatentRight()
+                        .setPatentId(params.getPatentId())
+                        .setType(1)
+                        .setContent(params.getContent())
+                        .setContentOut(params.getContentOut())
+                        .setSort(0)
+                        .setParentSort("-1");
+                //删除库表中原有该权要
+                this.deleteByPatentId(params.getPatentId());
+                //权要数据入表"os_patent_right"
+                patentRight.insert();
+
+            }
+//            //调用拆分权要工具类
+//            List<PatentRight> patentRights = PatentRightUtils.formatPatentRight(params);
+//            if (patentRights.size() > 0) {
+//                //TODO 先根据专利id查询库中原权要，与当前权要比对，若不同则更新，若相同则不更新
+//                PatentRight patentRight = new PatentRight()
+//                        .setPatentId(params.getPatentId())
+//                        .setType(1)
+//                        .setContent(params.getContent())
+//                        .setSort(0)
+//                        .setParentSort("-1");
+//                //删除库表中原有该权要
+//                this.deleteByPatentId(params.getPatentId());
+//                //权要数据入表"os_patent_right"
+//                this.saveOrUpdateBatch(patentRights);
+//            }
 
         } catch (Exception e) {
             e.printStackTrace();
@@ -459,7 +487,6 @@ public class PatentRightService extends ServiceImpl<PatentRightMapper, PatentRig
     }
 
 
-
 }