From 59493532b1d0507f338bb0a00731380962931829 Mon Sep 17 00:00:00 2001 From: hshansha Date: Fri, 30 May 2025 08:43:31 +0800 Subject: [PATCH] =?UTF-8?q?=E5=91=98=E5=B7=A5=E8=A1=A5=E8=B4=B4=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E4=B8=8D=E5=88=B0=E6=97=B6=E8=BF=94=E5=9B=9E=E7=A9=BA?= =?UTF-8?q?=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PayButieEmplyeeController.java | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) 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; }