From 7a8a84577894b766a95c6cbfa5ac7b51e54ac242 Mon Sep 17 00:00:00 2001
From: zhai <1528081232@qq.com>
Date: 星期三, 17 九月 2025 09:06:54 +0800
Subject: [PATCH] 1、获取文件大写修改 2、提交jdbc连接地质
---
src/main/java/com/zbooksoft/gdmis/controller/FileViewController.java | 27 +++++++++++++++++----------
1 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zbooksoft/gdmis/controller/FileViewController.java b/src/main/java/com/zbooksoft/gdmis/controller/FileViewController.java
index b224eb4..9732c55 100644
--- a/src/main/java/com/zbooksoft/gdmis/controller/FileViewController.java
+++ b/src/main/java/com/zbooksoft/gdmis/controller/FileViewController.java
@@ -8,6 +8,7 @@
import com.ruili.wcp.data.entity.management.User;
import com.ruili.wcp.service.config.ViewService;
import com.ruili.wcp.service.management.DeptService;
+import com.ruili.wcp.service.management.RoleService;
import com.ruili.wcp.service.management.UserService;
import com.ruili.wcp.web.common.UserFriendlyException;
import com.ruili.wcp.web.model.easyui.TreeVO;
@@ -28,10 +29,7 @@
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.servlet.ModelAndView;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* 妗ｆ娴忚鎺у埗鍣�
@@ -72,6 +70,8 @@
@Autowired
DeptService deptService;
+ @Autowired
+ RoleService roleService;
private static final Logger logger = LoggerFactory.getLogger(FileViewController.class);
@@ -477,15 +477,22 @@
Session session = currentUser.getSession();
User user = (User) session.getAttribute("user");
//鍏堝垽鏂槸鍚︽槸妗ｆ绠＄悊鍛� 濡傛灉鏄洿鎺ュ彲浠ユ祻瑙�
+
Long userId = user.getUserId();
- List<Dept> deptList = deptService.getSubDeptListByUserId(userId);
- for (Dept dept : deptList) {
- String deptName = dept.getDeptName();
- if (deptName.contains("妗ｆ绠＄悊鍛�")) {
- return true;
- }
+ Set<String> roles = user.getRoles();
+ if (roles.contains("妗ｆ绠＄悊鍛�")) {
+ return true;
}
+
+// List<Dept> deptList = deptService.getSubDeptListByUserId(userId);
+// for (Dept dept : deptList) {
+// String deptName = dept.getDeptName();
+// if (deptName.contains("妗ｆ绠＄悊鍛�")) {
+// return true;
+// }
+// }
+
// QueryWrapper<UtilizationUser> utilizationUserQueryWrapper = new QueryWrapper<>();
// utilizationUserQueryWrapper.eq("user_id", userId);
// UtilizationUser utilizationUser = utilizationUserService.getOne(utilizationUserQueryWrapper);
--
Gitblit v1.9.1