From f315cb9599bd6db3052e8fee019b9140474ea9ac Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 21 三月 2025 19:02:13 +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/service/impl/IdentityInformationServiceImpl.java | 33 ++++++++++++++++++++++-----------
1 files changed, 22 insertions(+), 11 deletions(-)
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 dbac408..b3678da 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
@@ -51,18 +51,29 @@
Integer isConfirm = (Integer) redisUtils.get("confirmContent:" + loginUserInfo.getPhone());
identityInformationVO.setIsConfirmContent(isConfirm != null && isConfirm == 1);
-
// 获取当前身份
- if (identity == null && systemUser != null) {
- identityInformationVO.setIdentity(2);
- redisUtils.set("identity:" + loginUserInfo.getPhone(), 2);
- } else if (identity == null && partyMember != null) {
- identityInformationVO.setIdentity(1);
- redisUtils.set("identity:" + loginUserInfo.getPhone(), 1);
- } else {
- identityInformationVO.setIdentity(null);
- redisUtils.remove("identity:" + loginUserInfo.getPhone());
+ if (identity == null){
+ if (systemUser != null){
+ identityInformationVO.setIdentity(2);
+ redisUtils.set("identity:" + loginUserInfo.getPhone(), 2);
+ }else if (partyMember != null && partyMember.getAuditStatus() == 1){
+ identityInformationVO.setIdentity(1);
+ redisUtils.set("identity:" + loginUserInfo.getPhone(), 1);
+ }else {
+ identityInformationVO.setIdentity(null);
+ }
+ }else {
+ if (identity == 1 && (partyMember == null || partyMember.getAuditStatus() != 1)){
+ identityInformationVO.setIdentity(null);
+ redisUtils.remove("identity:" + loginUserInfo.getPhone());
+ }else if (identity == 2 && systemUser == null){
+ identityInformationVO.setIdentity(null);
+ redisUtils.remove("identity:" + loginUserInfo.getPhone());
+ }else {
+ identityInformationVO.setIdentity(identity);
+ }
}
+
// 获取是否冻结
@@ -107,7 +118,7 @@
}
// 封装党员信息
- if (partyMember != null) {
+ if (partyMember != null && partyMember.getAuditStatus().equals(1)) {
PermissionsVO partyMemberPermissions = new PermissionsVO();
partyMemberPermissions.setIdentity(1);
partyMemberPermissions.setName(String.format("%s%s", partyMember.getCommunity(), "党员"));
--
Gitblit v1.7.1