From a84913e3d7da9ecdda96b258a342ad45a6c98e20 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期四, 20 三月 2025 09:46:16 +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 | 3 ++-
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/IdentityInformationServiceImpl.java | 2 +-
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/controller/HomeController.java | 1 +
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/resources/mapper/PartyMemberMapper.xml | 2 +-
4 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/controller/HomeController.java b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/controller/HomeController.java
index ad2cb00..72dbb0a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/controller/HomeController.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/controller/HomeController.java
@@ -58,6 +58,7 @@
// 获取党员信息
PartyMember partyMember = partyMemberService.getOne(new LambdaQueryWrapper<PartyMember>()
.eq(PartyMember::getPhone, loginUserInfo.getPhone())
+ .eq(PartyMember::getAuditStatus, 1)
.eq(PartyMember::getDelFlag, 0));
PartyCardInfoVO partyCardInfoVO = new PartyCardInfoVO();
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 8b2ddd3..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
@@ -80,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)));
}
/**
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/IdentityInformationServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/IdentityInformationServiceImpl.java
index 67faa01..8c491c3 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/IdentityInformationServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/IdentityInformationServiceImpl.java
@@ -59,7 +59,7 @@
} else if (identity == null && partyMember != null) {
identityInformationVO.setIdentity(1);
redisUtils.set("identity:" + loginUserInfo.getPhone(), 1);
- } else if(identity == null){
+ } else if(partyMember == null && systemUser == null && identity != null){
identityInformationVO.setIdentity(null);
redisUtils.remove("identity:" + loginUserInfo.getPhone());
} else {
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/resources/mapper/PartyMemberMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/resources/mapper/PartyMemberMapper.xml
index e18a414..38c93bc 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/resources/mapper/PartyMemberMapper.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/resources/mapper/PartyMemberMapper.xml
@@ -129,7 +129,7 @@
FROM
sgsb_party_member
WHERE
- audit_status = 0 and phone != ${phone}
+ audit_status = 0 and phone != ${phone} and del_flag = 0
<if test="accountLevel==2">
and districts_code = #{districtsCode}
</if>
--
Gitblit v1.7.1