From d189431077d55e7da372ef9db2e80a6aae935b29 Mon Sep 17 00:00:00 2001 From: Zangzhipeng Date: Fri, 12 Jul 2024 19:13:36 +0800 Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E5=88=86=E5=BC=82=E5=B8=B8=E5=A4=84?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/controller/HighDangerController.java | 34 +++++++++++++------ 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/hiatmp-base/src/main/java/com/hisense/hiatmp/base/controller/HighDangerController.java b/hiatmp-base/src/main/java/com/hisense/hiatmp/base/controller/HighDangerController.java index ce9e269..b3ae362 100644 --- a/hiatmp-base/src/main/java/com/hisense/hiatmp/base/controller/HighDangerController.java +++ b/hiatmp-base/src/main/java/com/hisense/hiatmp/base/controller/HighDangerController.java @@ -40,11 +40,15 @@ public class HighDangerController { HighDangerService highDangerService; // 查询各个状态的数据情况 - @GetMapping("/getHighDangerStatusNum/{nuserid}") - public ServerResponse getHighStatusNum(@PathVariable String nuserid){ - - Operator operatorById = operatorMapper.getOperatorById(nuserid); - String cdepartmentid = operatorById.getCdepartmentid(); + @GetMapping("/getHighDangerStatusNum") + public ServerResponse getHighStatusNum(@RequestParam String cusername){ + String cdepartmentid = null; + Operator operatorById = operatorMapper.getOperatorById(cusername); + if(operatorById != null){ + cdepartmentid = operatorById.getCdepartmentid(); + }else{ + return ServerResponse.error("未找到当前用户"); + } List statusCounts = highDangerMapper.getStatusCounts(cdepartmentid); @@ -56,10 +60,14 @@ public class HighDangerController { public ServerResponse getHighDealt(@RequestBody HighDangerBaseVO highDangerBaseVO, @RequestParam(defaultValue = "1") Integer pageNum, @RequestParam(defaultValue = "10") Integer pageSize){ - + String cdepartmentid = null; // 获取当前操作的对象，用于查找对应的部门 Operator operatorById = operatorMapper.getOperatorById(highDangerBaseVO.getCusername()); - String cdepartmentid = operatorById.getCdepartmentid(); + if(operatorById != null){ + cdepartmentid = operatorById.getCdepartmentid(); + }else{ + return ServerResponse.error("未找到当前用户"); + } Page page = new Page<>(pageNum, pageSize); @@ -98,10 +106,14 @@ public class HighDangerController { // 查询临期 & 超期任务 @PostMapping("/getHigDangerDying") public ServerResponse getHighDying(@RequestBody HighDangerBaseVO highDangerBaseVO){ - + String departmentId = null; // 查询当前登录用户的部门 Operator operatorById = operatorMapper.getOperatorById(highDangerBaseVO.getNuserid()); - String departmentId = operatorById.getCdepartmentid(); + if(operatorById != null){ + departmentId = operatorById.getCdepartmentid(); + }else{ + return ServerResponse.error("未找到当前用户"); + } // 查询该部门的指定状态的任务 List statusCounts = highDangerMapper.getHigDangerDying(highDangerBaseVO.getStatus(),departmentId); @@ -114,8 +126,8 @@ public class HighDangerController { // 查询指定任务详情任务 - @GetMapping("/getHigDangerDetail/{businessId}") - public ServerResponse getHighDetail(@PathVariable String businessId){ + @GetMapping("/getHigDangerDetail") + public ServerResponse getHighDetail(@RequestParam String businessId){ HighDangerBase highDangerBase = highDangerMapper.getHigDangerDetail(businessId);