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 477c988..a423601 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 @@ -187,16 +187,20 @@ public class PayButieEmplyeeController extends BaseController { List butieEmplyeeVos = iPayButieEmplyeeService.queryList(query); if(butieEmplyeeVos!=null&&butieEmplyeeVos.size()>0){ money=butieEmplyeeVos.get(0).getMoney(); + HashMap inMap = new HashMap<>(); + inMap.put("btid", butie.getId()); + inMap.put("money",money); + map.put(butie.getName(), inMap); } - HashMap inMap = new HashMap<>(); - inMap.put("btid", butie.getId()); - inMap.put("money",money); - map.put(butie.getName(), inMap); } - butieSummaryVo.setButieMap(map); - butieSummaryVo.setEdit(false); - butieSummaryVo.setEmpId(emp.getId()); - summaryVos.add(butieSummaryVo); + if(map.isEmpty()){ + //没找到员工查询月的补贴数据 ,不添加数据 + }else{ + butieSummaryVo.setButieMap(map); + butieSummaryVo.setEdit(false); + butieSummaryVo.setEmpId(emp.getId()); + summaryVos.add(butieSummaryVo); + } }); return summaryVos; }