fixed

src/main/java/cn/cslg/pas/controller/PatentController.java

@@ -191,7 +191,7 @@ public class PatentController {
         try {
             personId = mergePersonService.mergePerson(personVO);
         } catch (Exception e) {
-            return Response.success(e.getMessage());
+            return Response.error(e.getMessage());
         }
         return Response.success(personId);
     }
@@ -199,7 +199,12 @@ public class PatentController {
     @Operation(summary = "专利列表上再次新增发明人/权利人/申请人合并")
     @PostMapping("/mergePersonAgain")
     public Response mergePersonAgain(@RequestBody MergePersonAgainVO againVO) throws Exception {
-        Integer personId = mergePersonService.mergePersonAgain(againVO);
+        Integer personId = null;
+        try {
+            personId = mergePersonService.mergePersonAgain(againVO);
+        } catch (Exception e) {
+            return Response.error(e.getMessage());
+        }
         return Response.success(personId);
     }
 
@@ -210,7 +215,7 @@ public class PatentController {
         try {
             personId = mergePersonService.updateMergePerson(personVO);
         } catch (Exception e) {
-            return Response.success(e.getMessage());
+            return Response.error(e.getMessage());
         }
         return Response.success(personId);
     }
@@ -243,7 +248,7 @@ public class PatentController {
         try {
             id = mergePersonService.delMergedName(vo);
         } catch (Exception e) {
-            return Response.success(e.getMessage());
+            return Response.error(e.getMessage());
         }
         return Response.success(id);
     }
@@ -255,7 +260,7 @@ public class PatentController {
         try {
             id = mergePersonService.delMergePerson(vo);
         } catch (Exception e) {
-            return Response.success(e.getMessage());
+            return Response.error(e.getMessage());
         }
         return Response.success(id);
     }

src/main/java/cn/cslg/pas/service/business/MergePersonService.java

@@ -109,7 +109,7 @@ public class MergePersonService extends ServiceImpl<MergePersonMapper, MergePers
                 .eq(MergePerson::getProjectId, vo.getProjectId())
                 .eq(MergePerson::getName, vo.getName());
         List<MergePerson> list = mergePersonMapper.selectList(wrapper);
-        if (list.size() > 1) {
+        if (list.size() > 0) {
             throw new XiaoShiException("合并名称不可重复");
         }
 
@@ -460,7 +460,11 @@ public class MergePersonService extends ServiceImpl<MergePersonMapper, MergePers
         personVO.setAddress(vo.getAddress());
         personVO.setRemark(vo.getRemark());
         personVO.setMergedName(nameList);
-        return this.mergePerson(personVO);
+        Integer id = this.mergePerson(personVO);
+        if (id < 0) {
+            throw new XiaoShiException("再合并失败");
+        }
+        return id;
     }
 
     /**
@@ -482,9 +486,10 @@ public class MergePersonService extends ServiceImpl<MergePersonMapper, MergePers
         //判断是否名称重复
         LambdaQueryWrapper<MergePerson> wrapper = new LambdaQueryWrapper<MergePerson>()
                 .eq(MergePerson::getProjectId, vo.getProjectId())
-                .eq(MergePerson::getName, vo.getName());
+                .eq(MergePerson::getName, vo.getName())
+                .ne(BaseEntity::getId, vo.getId());
         List<MergePerson> list = mergePersonMapper.selectList(wrapper);
-        if (list.size() > 1) {
+        if (list.size() > 0) {
             throw new XiaoShiException("合并名称不可重复");
         }
         //获取老专利