From ab59270dff76c7bf93a38da9f47bcb044776c162 Mon Sep 17 00:00:00 2001
From: luofl <1442745593@qq.com>
Date: 星期四, 20 三月 2025 13:54:47 +0800
Subject: [PATCH] 修改按钮权限

---
 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/IdentityInformationServiceImpl.java |   56 +++++++++++++++++++++++++++++++-------------------------
 1 files changed, 31 insertions(+), 25 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 51e95d5..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,38 +51,13 @@
         Integer isConfirm = (Integer) redisUtils.get("confirmContent:" + loginUserInfo.getPhone());
         identityInformationVO.setIsConfirmContent(isConfirm != null && isConfirm == 1);
 
-
         // 获取当前身份
         if (identity == null){
             if (systemUser != null){
                 identityInformationVO.setIdentity(2);
-                Integer accountLevel = systemUser.getAccountLevel();
-                String districts = systemUser.getDistricts();
-                String street = systemUser.getStreet();
-                String community = systemUser.getCommunity();
-                PermissionsVO adminPermissions = new PermissionsVO();
-                adminPermissions.setIdentity(2);
-                adminPermissions.setIsFrozen(systemUser.getStatus() == 2);
-                if (accountLevel == 1) {
-                    adminPermissions.setName(String.format("%s%s", "攀枝花市", "管理员"));
-                } else if (accountLevel == 2) {
-                    adminPermissions.setName(String.format("%s%s", districts, "管理员"));
-                } else if (accountLevel == 3) {
-                    adminPermissions.setName(String.format("%s%s%s", districts, street, "管理员"));
-                } else if (accountLevel == 4) {
-                    adminPermissions.setName(String.format("%s%s%s%s", districts, street, community, "管理员"));
-                } else {
-                    adminPermissions.setName("未知");
-                }
-                permissions.add(adminPermissions);
                 redisUtils.set("identity:" + loginUserInfo.getPhone(), 2);
             }else if (partyMember != null && partyMember.getAuditStatus() == 1){
                 identityInformationVO.setIdentity(1);
-                PermissionsVO partyMemberPermissions = new PermissionsVO();
-                partyMemberPermissions.setIdentity(1);
-                partyMemberPermissions.setName(String.format("%s%s", partyMember.getCommunity(), "党员"));
-                partyMemberPermissions.setIsFrozen(partyMember.getFreezeStatus() == 1);
-                permissions.add(partyMemberPermissions);
                 redisUtils.set("identity:" + loginUserInfo.getPhone(), 1);
             }else {
                 identityInformationVO.setIdentity(null);
@@ -119,6 +94,37 @@
         // 党员审核状态
         identityInformationVO.setAuditStatus(partyMember == null ? null : partyMember.getAuditStatus());
 
+        // 封装管理员信息
+        if (systemUser != null) {
+            Integer accountLevel = systemUser.getAccountLevel();
+            String districts = systemUser.getDistricts();
+            String street = systemUser.getStreet();
+            String community = systemUser.getCommunity();
+            PermissionsVO adminPermissions = new PermissionsVO();
+            adminPermissions.setIdentity(2);
+            adminPermissions.setIsFrozen(systemUser.getStatus() == 2);
+            if (accountLevel == 1) {
+                adminPermissions.setName(String.format("%s%s", "攀枝花市", "管理员"));
+            } else if (accountLevel == 2) {
+                adminPermissions.setName(String.format("%s%s", districts, "管理员"));
+            } else if (accountLevel == 3) {
+                adminPermissions.setName(String.format("%s%s%s", districts, street, "管理员"));
+            } else if (accountLevel == 4) {
+                adminPermissions.setName(String.format("%s%s%s%s", districts, street, community, "管理员"));
+            } else {
+                adminPermissions.setName("未知");
+            }
+            permissions.add(adminPermissions);
+        }
+
+        // 封装党员信息
+        if (partyMember != null && partyMember.getAuditStatus().equals(1)) {
+            PermissionsVO partyMemberPermissions = new PermissionsVO();
+            partyMemberPermissions.setIdentity(1);
+            partyMemberPermissions.setName(String.format("%s%s", partyMember.getCommunity(), "党员"));
+            partyMemberPermissions.setIsFrozen(partyMember.getFreezeStatus() == 1);
+            permissions.add(partyMemberPermissions);
+        }
         identityInformationVO.setPermissions(permissions);
         return identityInformationVO;
     }

--
Gitblit v1.7.1