部分异常处理

hiatmp-base/src/main/java/com/hisense/hiatmp/base/controller/HighDangerController.java

@@ -40,11 +40,15 @@ public class HighDangerController {
     HighDangerService highDangerService;
 
     // 查询各个状态的数据情况
-    @GetMapping("/getHighDangerStatusNum/{nuserid}")
+    @GetMapping("/getHighDangerStatusNum")
-    public ServerResponse<?> getHighStatusNum(@PathVariable String nuserid){
+    public ServerResponse<?> getHighStatusNum(@RequestParam String cusername){
-
+        String cdepartmentid = null;
-        Operator operatorById = operatorMapper.getOperatorById(nuserid);
+        Operator operatorById = operatorMapper.getOperatorById(cusername);
-        String cdepartmentid = operatorById.getCdepartmentid();
+        if(operatorById != null){
+            cdepartmentid = operatorById.getCdepartmentid();
+        }else{
+            return ServerResponse.error("未找到当前用户");
+        }
 
         List<HighDangerBaseNum> 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<HighDangerBase> 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<HighDangerBase> statusCounts = highDangerMapper.getHigDangerDying(highDangerBaseVO.getStatus(),departmentId);
@@ -114,8 +126,8 @@ public class HighDangerController {
 
 
     // 查询指定任务详情任务
-    @GetMapping("/getHigDangerDetail/{businessId}")
+    @GetMapping("/getHigDangerDetail")
-    public ServerResponse<?> getHighDetail(@PathVariable String businessId){
+    public ServerResponse<?> getHighDetail(@RequestParam String businessId){
 
         HighDangerBase highDangerBase = highDangerMapper.getHigDangerDetail(businessId);