From 95d8e5f4348497b1eee5884086534c86b1661b4f Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 27 十月 2025 19:56:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/AssetStatisticsController.java | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/AssetStatisticsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/AssetStatisticsController.java
index 8258523..be6f3ff 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/AssetStatisticsController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/AssetStatisticsController.java
@@ -2,6 +2,7 @@
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.entity.TDept;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.framework.web.service.TokenService;
@@ -59,6 +60,8 @@
@Autowired
private TokenService tokenService;
@Autowired
+ private ISysUserService sysUserService;
+ @Autowired
private TDeptService deptService;
@ApiOperation("获取资产类型树形数据")
@@ -95,7 +98,8 @@
TDept dept = deptService.getById(deptId);
List<Integer> deptIds = deptService.getAllSubDeptIds(deptId);
Long userId = tokenService.getLoginUser().getUserId();
- if (!SecurityUtils.isAdmin(userId)) {
+ SysUser sysUser = sysUserService.selectUserById(userId);
+ if (!SecurityUtils.isAdmin(userId) || sysUser.getRoleId() != 1) {
if (dept.getDeptName().contains("资产管理")||dept.getDeptName().contains("董事长")||dept.getDeptName().contains("总经理")) {
// 可以查询所有数据
query.setDeptIds(new ArrayList<>());
@@ -107,7 +111,8 @@
}
}
}else{
-
+ List<Integer> deptIdsAll = deptService.list().stream().map(TDept::getId).collect(Collectors.toList());
+ query.setDeptIds(deptIdsAll);
}
return R.ok(assetTypeService.pageList(query));
@@ -120,7 +125,8 @@
TDept dept = deptService.getById(tokenService.getLoginUser().getDeptId());
List<Integer> deptIds = deptService.getAllSubDeptIds(deptId);
Long userId = tokenService.getLoginUser().getUserId();
- if (!SecurityUtils.isAdmin(userId)) {
+ SysUser sysUser = sysUserService.selectUserById(userId);
+ if (!SecurityUtils.isAdmin(userId) || sysUser.getRoleId() != 1) {
if (dept.getDeptName().contains("资产管理")||dept.getDeptName().contains("董事长")||dept.getDeptName().contains("总经理")) {
// 可以查询所有数据
query.setDeptIds(new ArrayList<>());
@@ -145,7 +151,8 @@
TDept dept = deptService.getById(tokenService.getLoginUser().getDeptId());
List<Integer> deptIds = deptService.getAllSubDeptIds(deptId);
Long userId = tokenService.getLoginUser().getUserId();
- if (!SecurityUtils.isAdmin(userId)) {
+ SysUser sysUser = sysUserService.selectUserById(userId);
+ if (!SecurityUtils.isAdmin(userId) || sysUser.getRoleId() != 1) {
if (dept.getDeptName().contains("资产管理")||dept.getDeptName().contains("董事长")||dept.getDeptName().contains("总经理")) {
// 可以查询所有数据
query.setDeptIds(new ArrayList<>());
@@ -206,7 +213,8 @@
TDept dept = deptService.getById(tokenService.getLoginUser().getDeptId());
List<Integer> deptIds = deptService.getAllSubDeptIds(deptId);
Long userId = tokenService.getLoginUser().getUserId();
- if (!SecurityUtils.isAdmin(userId)) {
+ SysUser sysUser = sysUserService.selectUserById(userId);
+ if (!SecurityUtils.isAdmin(userId) || sysUser.getRoleId() != 1) {
if (dept.getDeptName().contains("资产管理")||dept.getDeptName().contains("董事长")||dept.getDeptName().contains("总经理")) {
// 可以查询所有数据
query.setDeptIds(new ArrayList<>());
@@ -272,7 +280,8 @@
TDept dept = deptService.getById(tokenService.getLoginUser().getDeptId());
List<Integer> deptIds = new ArrayList<>();
Long userId = tokenService.getLoginUser().getUserId();
- if (!SecurityUtils.isAdmin(userId)) {
+ SysUser sysUser = sysUserService.selectUserById(userId);
+ if (!SecurityUtils.isAdmin(userId) || sysUser.getRoleId() != 1) {
if (dept.getDeptName().contains("资产管理")||dept.getDeptName().contains("拆迁")||dept.getDeptName().contains("安置")
||dept.getDeptName().contains("董事长")||dept.getDeptName().contains("总经理")) {
// 可以查询所有数据
--
Gitblit v1.7.1