From f2530067b6cd16a87b76190cf524d2ed75bf9592 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期六, 11 十月 2025 14:26:54 +0800
Subject: [PATCH] 集成中台及正联功能

---
 management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSystemConfigController.java |   24 ++++++++++++++----------
 1 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSystemConfigController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSystemConfigController.java
index d8b2b9f..57aaaf2 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSystemConfigController.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSystemConfigController.java
@@ -4,6 +4,7 @@
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.stylefeng.guns.core.base.controller.BaseController;
+import com.stylefeng.guns.core.beetl.ShiroExtUtil;
 import com.stylefeng.guns.core.shiro.ShiroKit;
 import com.stylefeng.guns.modular.system.controller.resp.CommissionAuditResp;
 import com.stylefeng.guns.modular.system.model.TAgent;
@@ -43,6 +44,9 @@
     private ITAgentService agentService;
     @Autowired
     private ITBranchOfficeService branchOfficeService;
+
+    @Autowired
+    private ShiroExtUtil shiroExtUtil;
 
     /**
      * 跳转到首页
@@ -108,8 +112,8 @@
      */
     @RequestMapping("/commissionShareRules")
     public String commissionShareRules(Model model) {
-        Integer roleType = ShiroKit.getUser().getRoleType();
-        Integer objectId = ShiroKit.getUser().getObjectId();
+        Integer roleType = shiroExtUtil.getUser().getRoleType();
+        Integer objectId = shiroExtUtil.getUser().getObjectId();
         TSystemConfig tSystemConfig = tSystemConfigService.selectOne(new EntityWrapper<TSystemConfig>().eq("type", 2)
                 .eq("companyType",roleType)
                 .eq("companyId",objectId)
@@ -258,8 +262,8 @@
      */
     @RequestMapping("/extractionRules")
     public String extractionRules(Model model) {
-        Integer roleType = ShiroKit.getUser().getRoleType();
-        Integer objectId = ShiroKit.getUser().getObjectId();
+        Integer roleType = shiroExtUtil.getUser().getRoleType();
+        Integer objectId = shiroExtUtil.getUser().getObjectId();
         model.addAttribute("roleType",roleType);
         TSystemConfig tSystemConfig = tSystemConfigService.selectOne(new EntityWrapper<TSystemConfig>().eq("type", 3)
                 .eq("companyType",roleType)
@@ -337,8 +341,8 @@
      */
     @RequestMapping("/balanceRules")
     public String balanceRules(Model model) {
-        Integer roleType = Objects.requireNonNull(ShiroKit.getUser()).getRoleType();
-        Integer objectId = Objects.requireNonNull(ShiroKit.getUser()).getObjectId();
+        Integer roleType = Objects.requireNonNull(shiroExtUtil.getUser()).getRoleType();
+        Integer objectId = Objects.requireNonNull(shiroExtUtil.getUser()).getObjectId();
         TSystemConfig tSystemConfig = tSystemConfigService.selectOne(new EntityWrapper<TSystemConfig>().eq("type", 6)
                 .eq("companyType",roleType)
                 .eq("companyId",objectId)
@@ -358,8 +362,8 @@
      */
     @RequestMapping("/serviceMgmt")
     public String serviceMgmt(Model model) {
-        Integer roleType = Objects.requireNonNull(ShiroKit.getUser()).getRoleType();
-        Integer objectId = Objects.requireNonNull(ShiroKit.getUser()).getObjectId();
+        Integer roleType = Objects.requireNonNull(shiroExtUtil.getUser()).getRoleType();
+        Integer objectId = Objects.requireNonNull(shiroExtUtil.getUser()).getObjectId();
         if(roleType == 1){
             TSystemConfig tSystemConfig = tSystemConfigService.selectOne(new EntityWrapper<TSystemConfig>().eq("type", 7)
                     .last("LIMIT 1"));
@@ -383,8 +387,8 @@
     @ResponseBody
     public Object systemConfigSubmit(Integer type,String content) {
 
-        Integer roleType = Objects.requireNonNull(ShiroKit.getUser()).getRoleType();
-        Integer objectId = Objects.requireNonNull(ShiroKit.getUser()).getObjectId();
+        Integer roleType = Objects.requireNonNull(shiroExtUtil.getUser()).getRoleType();
+        Integer objectId = Objects.requireNonNull(shiroExtUtil.getUser()).getObjectId();
         if(roleType == 3){
             TAgent tAgent = agentService.selectById(objectId);
             if (Objects.nonNull(tAgent)){

--
Gitblit v1.7.1