From 8254f017ec6f4090fa65de76dcaf1d31e5161a11 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 18 三月 2025 10:08:15 +0800
Subject: [PATCH] bug修改
---
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/controller/HomeController.java | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 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 41d756a..d60f3a5 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
@@ -129,7 +129,7 @@
Integer isConfirm = (Integer) redisUtils.get("confirmContent:" + loginUserInfo.getPhone());
List<PermissionsVO> permissions = new ArrayList<>();
IdentityInformationVO identityInformationVO = new IdentityInformationVO();
- identityInformationVO.setIsConfirmContent(isConfirm == 1);
+ identityInformationVO.setIsConfirmContent(isConfirm !=null && isConfirm == 1);
if (partyMember != null) {
identityInformationVO.setIsFrozen(partyMember.getFreezeStatus() == 1);
}
@@ -140,10 +140,26 @@
if (identity == null && systemUser != null) {
identityInformationVO.setIdentity(2);
redisUtils.set("identity:" + loginUserInfo.getPhone(), 2);
- } else {
+ }else if (identity == null && partyMember != null){
+ identityInformationVO.setIdentity(1);
+ redisUtils.set("identity:" + loginUserInfo.getPhone(), 1);
+ }
+ else {
identityInformationVO.setIdentity(identity);
}
+ if (identityInformationVO.getIdentity() != null){
+ if (identityInformationVO.getIdentity() == 1){
+ identityInformationVO.setIsFrozen(partyMember !=null && partyMember.getFreezeStatus() == 1);
+ }else if (identityInformationVO.getIdentity() == 2){
+ identityInformationVO.setIsFrozen(systemUser != null &&systemUser.getStatus() == 2);
+ }
+ }else {
+ identityInformationVO.setIsFrozen(false);
+ }
+
+
+
identityInformationVO.setIsPartymember(partyMember != null && partyMember.getAuditStatus().equals(1));
identityInformationVO.setIsConfirm(partyMember != null && partyMember.getIsConfirm() == 1);
identityInformationVO.setAuditStatus(partyMember == null ? null : partyMember.getAuditStatus());
--
Gitblit v1.7.1