From e4d449b18083e45d9b808ec0350deaec1ced88a2 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 02 四月 2025 14:49:47 +0800
Subject: [PATCH] Merge remote-tracking branch '喜望/dev-2.0' into dev-2.0
---
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/controller/PartyMemberController.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 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 0c4e61a..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
@@ -4,6 +4,7 @@
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;
@@ -40,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();
}
@@ -73,7 +80,8 @@
LoginUserInfoVO loginUserInfo = getLoginUserInfo();
String phone = loginUserInfo.getPhone();
return R.ok(partyMemberService.getOne(new LambdaUpdateWrapper<PartyMember>()
- .eq(PartyMember::getPhone, phone)));
+ .eq(PartyMember::getPhone, phone)
+ .eq(PartyMember::getDelFlag, 0)));
}
/**
--
Gitblit v1.7.1