管控bug

blade-service/blade-control/src/main/java/org/springblade/control/controller/LogHistoryController.java

@@ -31,7 +31,7 @@ public class LogHistoryController extends BladeController {
     public R<Map<String, List<LogHistoryInfoVO>>> logList(@RequestBody LogHistoryInfoDTO dto) {
         Map<String, List<LogHistoryInfoVO>> stringListMap = logHistoryService.logList(dto);
         if (ObjectUtil.isNotEmpty(stringListMap)) {
-            return R.data(logHistoryService.logList(dto));
+            return R.data(stringListMap);
         }
         return R.fail(200, "未查询到数据");
     }
@@ -47,7 +47,11 @@ public class LogHistoryController extends BladeController {
     @ApiOperationSupport(order = 3)
     @ApiOperation(value = "日志填报详情", notes = "传入日志id")
     public R<LogHistoryInfoVO> logDetail(@RequestParam Long id, BladeUser bladeUser) {
-        return R.data(logHistoryService.logDetail(id, bladeUser));
+        LogHistoryInfoVO logHistoryInfoVO = logHistoryService.logDetail(id, bladeUser);
+        if (logHistoryInfoVO != null) {
+            return R.data(logHistoryInfoVO);
+        }
+        return R.fail(200, "未查询到数据");
     }
 
     @PostMapping("/remove")
@@ -70,7 +74,7 @@ public class LogHistoryController extends BladeController {
     public R<List<TaskPlanInfoVO>> logTaskList() {
         List<TaskPlanInfoVO> taskPlanInfoVOS = logHistoryService.logTaskList();
         if (taskPlanInfoVOS.size() > 0) {
-            return R.data(logHistoryService.logTaskList());
+            return R.data(taskPlanInfoVOS);
         }
         return R.fail(200, "未查询到数据");
     }