汇总接口的实现（财务）-优化

ruoyi-wages/src/main/java/com/ruoyi/system/controller/WagesController.java

@@ -91,9 +91,12 @@ public class WagesController {
 
 
     @PostMapping("/lxSummary")
-    public List<WagesLxVo> lxSummary(@RequestBody WagesFormulaListDto wagesFormulaListDto){
+    public AjaxResult lxSummary(@RequestBody WagesFormulaListDto wagesFormulaListDto){
         List<WagesLxVo> list = wagesService.lxSummary(wagesFormulaListDto);
-        return list;
+        if (list == null) {
+            return AjaxResult.error("数据为空,请检查查询条件");
+        }
+        return AjaxResult.success("查询成功",list);
     }
 
 

ruoyi-wages/src/main/java/com/ruoyi/system/service/impl/WagesServiceImpl.java

@@ -331,6 +331,9 @@ public class WagesServiceImpl implements WagesService {
 
         //财务用表数据查询
         WagesCompilationExcelDAO compilationExcelDAOS = wagesCompilationMapper.select("011704", "1");
+        if (compilationExcelDAOS == null) {
+            return null;
+        }
         Integer comparisonId = compilationExcelDAOS.getComparisonId();
         List<WagesDetailsExcelDAO> wagesDetailsExcelDAOS = wagesDetailsMapper.selectByComparisonId(comparisonId);
         for (WagesFormulaDto wagesFormulaDto : data) {