From de291fdd4ed240c6f5c2c70070beebbb323dc4f6 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期三, 29 九月 2021 17:44:08 +0800
Subject: [PATCH] Merge branch 'base_data' into test
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 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 835bdb2..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
@@ -4,6 +4,7 @@
import javax.annotation.Resource;
+import com.panzhihua.common.interfaces.OperLog;
import org.springframework.util.ObjectUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -244,4 +245,21 @@
// }
return partyBuildingService.listPartyOrganizationByApp(comListPartyDTO);
}
+
+ @OperLog(operModul = "党员管理", operType = 2)
+ @ApiOperation(value = "编辑党员")
+ @PutMapping("updatepartybuildingmember")
+ public R updatePartyBuildingMember(@RequestBody PartyBuildingMemberVO partyBuildingMemberVO) {
+ 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 R.fail();
+ }
}
--
Gitblit v1.7.1