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/AssetHouseInspectionItemController.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/AssetHouseInspectionItemController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/AssetHouseInspectionItemController.java
index 35f9633..d7c7a2a 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/AssetHouseInspectionItemController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/AssetHouseInspectionItemController.java
@@ -139,7 +139,8 @@
Map<Integer, String> map = assetPropertyExtService.lambdaQuery().isNotNull(AssetPropertyExt::getRoomNumber).list()
.stream().collect(Collectors.toMap(AssetPropertyExt::getAssetMainId, AssetPropertyExt::getRoomNumber));
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("总经理")) {
List<AssetMain> list = assetMainService.lambdaQuery()
.eq(AssetMain::getAssetTypeId, assetType.getId())
--
Gitblit v1.7.1