From 33fb76bd70cf84cebbe26b96e5faedd22961f0b0 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 16 八月 2023 15:54:47 +0800
Subject: [PATCH] 修改bug

---
 management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSystemConfigController.java |   23 +++++++++++++++++------
 1 files changed, 17 insertions(+), 6 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 faea423..c7f1e2b 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
@@ -81,7 +81,7 @@
         model.addAttribute("num2",jsonObject.getInteger("num2"));
         model.addAttribute("num3",jsonObject.getInteger("num3"));
         model.addAttribute("num4",jsonObject.getInteger("num4"));
-        model.addAttribute("num5",jsonObject.getInteger("num5"));
+//        model.addAttribute("num5",jsonObject.getInteger("num5"));
         return PREFIX + "tSystemConfigDispatchRules.html";
     }
 
@@ -113,7 +113,8 @@
         JSONObject jsonObject = JSONObject.parseObject(tSystemConfig.getContent());
         model.addAttribute("num1",jsonObject.getInteger("num1"));
         model.addAttribute("num2",jsonObject.getInteger("num2"));
-        model.addAttribute("num3",jsonObject.getInteger("num3"));
+        model.addAttribute("num3",jsonObject.getString("num3"));
+        model.addAttribute("num4",jsonObject.getString("num4"));
         return PREFIX + "tSystemConfigExtractionRules.html";
     }
     /**
@@ -184,10 +185,20 @@
      */
     @RequestMapping("/serviceMgmt")
     public String serviceMgmt(Model model) {
-        TSystemConfig tSystemConfig = tSystemConfigService.selectOne(new EntityWrapper<TSystemConfig>().eq("type", 7)
-                .last("LIMIT 1"));
-        JSONObject jsonObject = JSONObject.parseObject(tSystemConfig.getContent());
-        model.addAttribute("num1",jsonObject.getString("num1"));
+        Integer roleType = Objects.requireNonNull(ShiroKit.getUser()).getRoleType();
+        Integer objectId = Objects.requireNonNull(ShiroKit.getUser()).getObjectId();
+        if(roleType == 1){
+            TSystemConfig tSystemConfig = tSystemConfigService.selectOne(new EntityWrapper<TSystemConfig>().eq("type", 7)
+                    .last("LIMIT 1"));
+            JSONObject jsonObject = JSONObject.parseObject(tSystemConfig.getContent());
+            model.addAttribute("num1",jsonObject.getString("num1"));
+        }
+        if(roleType == 3){
+            TAgent tAgent = agentService.selectById(objectId);
+            if (Objects.nonNull(tAgent)){
+                model.addAttribute("num1",tAgent.getServiceCalls());
+            }
+        }
         return PREFIX + "tSystemConfigServiceMgmt.html";
     }
 

--
Gitblit v1.7.1