From 7ed6489395475fc41d33914dfcc940b75ff65101 Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期四, 18 五月 2023 16:35:29 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSystemConfigController.java | 18 ++++++++++++++---- 1 files changed, 14 insertions(+), 4 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..678e0f6 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 @@ -184,10 +184,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