From 039abee6b27058ca46b1e1e82aa0b5407a5dad44 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 28 七月 2025 15:25:26 +0800
Subject: [PATCH] 优化 和修改bug
---
springcloud_k8s_panzhihuazhihuishequ/service_westcommittee/src/main/java/com/panzhihua/westcommittee/controller/HomeController.java | 34 ++++++++++++----------------------
1 files changed, 12 insertions(+), 22 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_westcommittee/src/main/java/com/panzhihua/westcommittee/controller/HomeController.java b/springcloud_k8s_panzhihuazhihuishequ/service_westcommittee/src/main/java/com/panzhihua/westcommittee/controller/HomeController.java
index 8ed2671..570ce22 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_westcommittee/src/main/java/com/panzhihua/westcommittee/controller/HomeController.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_westcommittee/src/main/java/com/panzhihua/westcommittee/controller/HomeController.java
@@ -13,7 +13,6 @@
import com.panzhihua.westcommittee.model.entity.Banner;
import com.panzhihua.westcommittee.model.entity.PartyMember;
import com.panzhihua.westcommittee.model.entity.SystemUser;
-import com.panzhihua.westcommittee.model.entity.SystemUserLevel;
import com.panzhihua.westcommittee.model.query.BasePage;
import com.panzhihua.westcommittee.model.vo.ComplaintTodoVO;
import com.panzhihua.westcommittee.model.vo.MessageNotificationVO;
@@ -93,26 +92,8 @@
@ApiOperation("获取西区纪委当前用户信息 用于判断用户是否是上级")
public R<SystemUser> getCurrentUserInfo() {
SystemUser systemUser = systemUserService.getSystemUserAdminByPhone(getLoginUserInfo().getPhone()).orElse(null);
- Object o1 = redisUtils.get("identity:" + getLoginUserInfo().getPhone());
- if(o1!=null){
- UserIdentityDTO o2 = (UserIdentityDTO) o1;
- Integer levelId = o2.getLevelId();
- if(levelId!=null) {
- SystemUserLevel systemUserLevel = systemUserLevelService.getById(levelId);
- if (systemUserLevel == null) {
- List<SystemUserLevel> list = systemUserLevelService.list(new LambdaQueryWrapper<SystemUserLevel>().eq(SystemUserLevel::getSystemUserId, systemUser.getId()).eq(SystemUserLevel::getStatus, 1));
- if (list.size() > 0) {
- systemUser.setLevelId(list.get(0).getLevel());
- }
- } else {
- systemUser.setLevelId(systemUserLevel.getLevel());
- }
- }else {
- List<SystemUserLevel> list = systemUserLevelService.list(new LambdaQueryWrapper<SystemUserLevel>().eq(SystemUserLevel::getSystemUserId, systemUser.getId()).eq(SystemUserLevel::getStatus, 1));
- if (list.size() > 0) {
- systemUser.setLevelId(list.get(0).getLevel());
- }
- }
+ if(systemUser!=null){
+ systemUser.setLevelId(systemUser.getAccountLevel());
}
return R.ok(systemUser);
}
@@ -148,6 +129,7 @@
throw new RuntimeException(e);
}
}
+
/**
* 获取身份信息
*/
@@ -160,7 +142,6 @@
BeanUtils.copyProperties(identityInformation, identityInformationVO);
return R.ok(identityInformationVO);
}
-
/**
@@ -196,4 +177,13 @@
redisUtils.set("confirmContent:" + loginUserInfo.getPhone(), 1);
return R.ok();
}
+
+
+ @GetMapping("/getComplaintTip")
+ @ApiOperation("管理员获取提示弹窗")
+ public R<?> getComplaintTip() {
+ LoginUserInfoVO loginUserInfo = getLoginUserInfo();
+ return R.ok(complaintService.getComplaintTip(loginUserInfo));
+ }
+
}
--
Gitblit v1.7.1