From 6584fc650eb51e30ab185c7bff2439b4bcdc6186 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 12 一月 2026 17:07:40 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/QianYunTong into dev
---
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCompanyController.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCompanyController.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCompanyController.java
index c25bc65..53bb31c 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCompanyController.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCompanyController.java
@@ -93,6 +93,10 @@
//经营区域
List<Map<String, Object>> scopeList = tCompanyService.getCompanyScopeById(tCompany.getId());
model.addAttribute("scopeList",scopeList);
+
+ //传递当前用户角色类型，用于控制非平台账号禁用经营业务和经营区域编辑
+ model.addAttribute("roleType", user1.getRoleType());
+
return PREFIX + "platformEdit.html";
}
@@ -184,6 +188,9 @@
//经营区域
List<Map<String, Object>> scopeList = tCompanyService.getCompanyScopeById(tCompanyId);
model.addAttribute("scopeList",scopeList);
+
+ // 传递当前用户角色类型，用于控制非平台账号禁用经营业务和经营区域编辑
+ model.addAttribute("roleType", shiroExtUtil.getUser().getRoleType());
return PREFIX + "tCompany_edit.html";
}
--
Gitblit v1.7.1