Merge branch 'master' of git.yfzx.zjtys.com.cn:912-system/monitor/inspect

src/main/java/com/zjty/inspect/controller/EvaluationController.java

@@ -2,7 +2,6 @@ package com.zjty.inspect.controller;
 
 import com.zjty.inspect.entity.Evaluation;
 import com.zjty.inspect.entity.PageResult;
-import com.zjty.inspect.entity.RuleQo;
 import com.zjty.inspect.service.EvaluationService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -37,13 +36,19 @@ public class EvaluationController {
     @GetMapping(value = "/{name}")
     public ResponseEntity getName(@PathVariable String name) {
         Evaluation evaluation = evaluationService.findByName(name);
-        return ResponseEntity.ok(evaluation.getOutEva());
+        if(evaluation!=null){
+            return ResponseEntity.ok(evaluation.getOutEva());
+        }
+        return ResponseEntity.ok(null);
     }
     @ApiOperation("根据用户名查询输如")
     @GetMapping(value = "/in/{name}")
     public ResponseEntity getInName(@PathVariable String name) {
         Evaluation evaluation = evaluationService.findByName(name);
-        return ResponseEntity.ok(evaluation.getInEva());
+        if(evaluation!=null){
+            return ResponseEntity.ok(evaluation.getInEva());
+        }
+        return ResponseEntity.ok(null);
     }
     /**
      * 修改评估报告

src/main/java/com/zjty/inspect/service/impl/EvaluationServiceImpl.java

@@ -73,7 +73,11 @@ public class EvaluationServiceImpl implements EvaluationService {
 
     @Override
     public Evaluation findByName(String name) {
-        return evaluationDao.findByUsername(name);
+        Evaluation evaluation = evaluationDao.findByUsername(name);
+        if(evaluation!=null){
+            return evaluation;
+        }
+        return null;
     }