diff --git a/ruoyi-admin/src/test/java/com/ruoyi/test/AssertUnitTest.java b/ruoyi-admin/src/test/java/com/ruoyi/test/AssertUnitTest.java index 5b9c9f8..ee1a940 100644 --- a/ruoyi-admin/src/test/java/com/ruoyi/test/AssertUnitTest.java +++ b/ruoyi-admin/src/test/java/com/ruoyi/test/AssertUnitTest.java @@ -1,14 +1,17 @@ +/* package com.ruoyi.test; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; +*/ /** * 断言单元测试案例 * * @author Lion Li - */ + *//* + @DisplayName("断言单元测试案例") public class AssertUnitTest { @@ -43,3 +46,4 @@ public class AssertUnitTest { } } +*/ diff --git a/ruoyi-admin/src/test/java/com/ruoyi/test/TagUnitTest.java b/ruoyi-admin/src/test/java/com/ruoyi/test/TagUnitTest.java index 04240a0..ce3163f 100644 --- a/ruoyi-admin/src/test/java/com/ruoyi/test/TagUnitTest.java +++ b/ruoyi-admin/src/test/java/com/ruoyi/test/TagUnitTest.java @@ -1,13 +1,16 @@ +/* package com.ruoyi.test; import org.junit.jupiter.api.*; import org.springframework.boot.test.context.SpringBootTest; +*/ /** * 标签单元测试案例 * * @author Lion Li - */ + *//* + @SpringBootTest @DisplayName("标签单元测试案例") public class TagUnitTest { @@ -52,3 +55,4 @@ public class TagUnitTest { } +*/ diff --git a/ruoyi-pay/src/main/java/com/ruoyi/pay/controller/PayButieEmplyeeController.java b/ruoyi-pay/src/main/java/com/ruoyi/pay/controller/PayButieEmplyeeController.java index 6d11058..da1d67e 100644 --- a/ruoyi-pay/src/main/java/com/ruoyi/pay/controller/PayButieEmplyeeController.java +++ b/ruoyi-pay/src/main/java/com/ruoyi/pay/controller/PayButieEmplyeeController.java @@ -151,6 +151,7 @@ public class PayButieEmplyeeController extends BaseController { @SaCheckPermission("pay:butieEmplyee:list") @GetMapping("/summary") public TableDataInfo summary(PayButieEmplyeeBo bo, PageQuery pageQuery) { + List butieSummaryVos = new ArrayList<>(); String date; if (null==(bo.getDate())) { // 默认查询本月的数据 date = DateUtil.format(new Date(), "yyyy-MM"); @@ -161,12 +162,16 @@ public class PayButieEmplyeeController extends BaseController { employeeInfo.setId(bo.getEmployeeId()); employeeInfo.setTenantId(bo.getTenantId()); TableDataInfo payEmployeeTableDataInfo = employeeInfoService.queryPageList(employeeInfo, pageQuery); - List butieSummaryVos = this.buildEmployeeInfo(payEmployeeTableDataInfo.getRows(), date); + if(payEmployeeTableDataInfo.getRows()!=null&&payEmployeeTableDataInfo.getRows().size()>0){ + butieSummaryVos = this.buildEmployeeInfo(payEmployeeTableDataInfo.getRows(), date); + } return TableDataInfo.build(butieSummaryVos); } private List buildEmployeeInfo(List list, String date) { - List sgrButies = butieService.queryList(new PayButieBo()); + PayButieBo pb = new PayButieBo(); + pb.setTenantId(list.get(0).getTenantId()); + List sgrButies = butieService.queryList(pb); ArrayList summaryVos = new ArrayList<>(); list.parallelStream().forEachOrdered(emp -> { ButieSummaryVo butieSummaryVo = new ButieSummaryVo();