From d6d00c7fbd97c6243cc259f563f081a1e479a9a2 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期三, 29 九月 2021 17:40:15 +0800
Subject: [PATCH] 基础数据功能修改

---
 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java
index 2b296b6..bd58309 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java
@@ -250,10 +250,16 @@
     @ApiOperation(value = "编辑党员")
     @PutMapping("updatepartybuildingmember")
     public R updatePartyBuildingMember(@RequestBody PartyBuildingMemberVO partyBuildingMemberVO) {
-        Long id = partyBuildingMemberVO.getId();
-        if (null == id || 0 == id) {
-            return R.fail("党员id不能为空");
+        if(partyBuildingMemberVO.getIsPb()!=null){
+            Long id = partyBuildingMemberVO.getId();
+            if(partyBuildingMemberVO.getIsPb()==1){
+                if (null == id || 0 == id) {
+                    return partyBuildingService.addPartyBuildingMember(partyBuildingMemberVO);
+                }
+                return partyBuildingService.updatePartyBuildingMember(partyBuildingMemberVO);
+            }
+            return partyBuildingService.deleteprepartybuildingmember(id);
         }
-        return partyBuildingService.updatePartyBuildingMember(partyBuildingMemberVO);
+        return R.fail();
     }
 }

--
Gitblit v1.7.1