From b6332c39450cbea5ed3c2fd15d2d09f5fbc7ccf0 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 17 三月 2025 22:31:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-2.0' into dev-2.0
---
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/controller/HomeController.java | 5 ++++-
1 files changed, 4 insertions(+), 1 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 d60f3a5..e07bf58 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
@@ -59,6 +59,7 @@
.eq(PartyMember::getDelFlag, 0));
PartyCardInfoVO partyCardInfoVO = new PartyCardInfoVO();
+ partyCardInfoVO.setAvatar(partyMember.getAvatar());
partyCardInfoVO.setName(partyMember.getName());
partyCardInfoVO.setIdCard(partyMember.getIdNumber());
partyCardInfoVO.setDistricts(partyMember.getDistricts());
@@ -181,10 +182,12 @@
if (accountLevel == 1){
adminPermissions.setName(String.format("%s%s%s%s%s", "攀枝花市",districts, street, community, "管理员"));
}if (accountLevel == 2) {
- adminPermissions.setIdentity(2);
+ adminPermissions.setName(String.format("%s%s%s%s", districts, street, community, "管理员"));
} else if (accountLevel == 3) {
adminPermissions.setIdentity(2);
+ adminPermissions.setName(String.format("%s%s%s", street, community, "管理员"));
} else if (accountLevel == 4) {
+ adminPermissions.setName(String.format("%s%s", community, "管理员"));
adminPermissions.setIdentity(2);
}
permissions.add(adminPermissions);
--
Gitblit v1.7.1