From 0eb28fecafb15512c82aeae00b40fb1bca65f08c Mon Sep 17 00:00:00 2001
From: luofl <1442745593@qq.com>
Date: 星期五, 21 三月 2025 18:41:57 +0800
Subject: [PATCH] 修改按钮权限

---
 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/controller/PartyMemberController.java |   48 +++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 43 insertions(+), 5 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/controller/PartyMemberController.java b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/controller/PartyMemberController.java
index 7709745..47f0bd0 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/controller/PartyMemberController.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/controller/PartyMemberController.java
@@ -1,8 +1,11 @@
 package com.panzhihua.sangeshenbian.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.exceptions.ServiceException;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
 import com.panzhihua.common.model.vos.R;
 import com.panzhihua.sangeshenbian.model.entity.PartyMember;
 import com.panzhihua.sangeshenbian.service.IPartyMemberService;
@@ -14,6 +17,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -37,6 +41,12 @@
     @ApiOperation(value = "党员申请")
     @PostMapping("/apply")
     public R<?> apply(@Valid @RequestBody PartyMemberApplicationRequest dto) {
+        int count = partyMemberService.count(new LambdaQueryWrapper<PartyMember>()
+                .eq(PartyMember::getPhone, getLoginUserInfo().getPhone())
+                .eq(PartyMember::getDelFlag, 0));
+        if (count > 0){
+            return R.fail("您已提交过申请,请勿重复提交");
+        }
         partyMemberService.applyForMembership(dto, getLoginUserInfo());
         return R.ok();
     }
@@ -47,9 +57,14 @@
     @ApiOperation(value = "编辑党员信息")
     @PostMapping("/edit")
     public R<?> edit(@Valid @RequestBody PartyMemberApplicationRequest dto) {
-        if (Objects.isNull(dto.getId())){
-            return R.fail("id不能为空");
+        LoginUserInfoVO loginUserInfo = getLoginUserInfo();
+        String phone = loginUserInfo.getPhone();
+        PartyMember partyMember = partyMemberService.getOne(new LambdaUpdateWrapper<PartyMember>()
+                .eq(PartyMember::getPhone, phone));
+        if (partyMember == null){
+            return R.fail("请先完善党员信息");
         }
+        dto.setId(partyMember.getId());
         partyMemberService.applyForMembership(dto, getLoginUserInfo());
         return R.ok();
     }
@@ -61,8 +76,12 @@
      */
     @ApiOperation(value = "党员信息详情")
     @PostMapping("/detail")
-    public R<?> detail(@RequestParam Long id) {
-        return R.ok(partyMemberService.getById(id));
+    public R<?> detail() {
+        LoginUserInfoVO loginUserInfo = getLoginUserInfo();
+        String phone = loginUserInfo.getPhone();
+        return R.ok(partyMemberService.getOne(new LambdaUpdateWrapper<PartyMember>()
+                .eq(PartyMember::getPhone, phone)
+                .eq(PartyMember::getDelFlag, 0)));
     }
 
     /**
@@ -70,7 +89,7 @@
      */
     @ApiOperation(value = "党员待审核列表")
     @PostMapping("/pre-audit-list")
-    public R<?> preAuditList(Page<PendingPartyMemberApplicationVO> page) {
+    public R<Page<PendingPartyMemberApplicationVO>> preAuditList(Page<PendingPartyMemberApplicationVO> page) {
         return R.ok(partyMemberService.preAuditList(page,getLoginUserInfo()));
     }
 
@@ -94,6 +113,25 @@
         return R.ok();
     }
 
+    /**
+     * 确认党员信息
+     */
+    @GetMapping("/confirm-party-member-info")
+    @ApiOperation("确认党员信息")
+    public R<?> confirmPartyMemberInfo() {
+        LoginUserInfoVO loginUserInfo = getLoginUserInfo();
+        // 获取党员信息
+        PartyMember partyMember = partyMemberService.getOne(new LambdaQueryWrapper<PartyMember>()
+                .eq(PartyMember::getPhone, loginUserInfo.getPhone())
+                .eq(PartyMember::getDelFlag, 0));
+        if (partyMember == null){
+            return R.fail("请先完善党员信息");
+        }
+        partyMember.setIsConfirm(1);
+        partyMemberService.updateById(partyMember);
+        return R.ok();
+    }
+
 
 
 }

--
Gitblit v1.7.1