From 30f124fbe2c638eecda3d74c6dde053af5d574f0 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期六, 11 十月 2025 14:26:17 +0800
Subject: [PATCH] 提交代码
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TBranchOfficeController.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TBranchOfficeController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TBranchOfficeController.java
index ace4df5..2271853 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TBranchOfficeController.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TBranchOfficeController.java
@@ -71,7 +71,7 @@
*/
@RequestMapping("")
public String index(Model model) {
- model.addAttribute("userType", Objects.requireNonNull(ShiroKit.getUser()).getRoleType());
+ model.addAttribute("userType", Objects.requireNonNull(shiroExtUtil.getUser()).getRoleType());
return PREFIX + "tBranchOffice.html";
}
@@ -674,6 +674,7 @@
if (SinataUtil.isNotEmpty(tBranchOffice.getAccount()) && SinataUtil.isNotEmpty(tBranchOffice.getPassword())){
if(Objects.isNull(user)){
//添加User对象
+ user = new User();
user.setAccount(tBranchOffice.getAccount());
user.setSalt(ShiroKit.getRandomSalt(5));
user.setPassword(ShiroKit.md5(tBranchOffice.getPassword(), user.getSalt()));
--
Gitblit v1.7.1