liusheng
2026-08-28 b0d0169d6cfe1f1e00a69794e9023e1040d211d1
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementServiceImpl.java
@@ -136,7 +136,7 @@
        if (serviceReimbursement.getCreateTime() != null) {
            wrappers.eq(ServiceReimbursement::getCreateTime, serviceReimbursement.getCreateTime());
        }
        if (!serviceReimbursement.getUsername().equals("shenji")) {
        if (StringUtils.isNotBlank(serviceReimbursement.getUsername()) && !serviceReimbursement.getUsername().equals("shenji")) {
            wrappers.like(ServiceReimbursement::getUsername, serviceReimbursement.getUsername());
        }
        if (StringUtils.isNotBlank(serviceReimbursement.getTravelers())) {
@@ -450,11 +450,15 @@
                if (StringUtils.isNotBlank(checkFundVO.getFlowcontent()))
                    map.put("意见:", checkFundVO.getFlowcontent());
                contentList.add(map);
                DingTalkReqVo dingTalkReqVo = new DingTalkReqVo();
                dingTalkReqVo.setTitle("财务系统驳回信息");
                dingTalkReqVo.setNumber(sysUser.getPhonenumber());
                dingTalkReqVo.setContents(contentList);
                dingTalkService.sendNotification(dingTalkReqVo);
                try {
                    DingTalkReqVo dingTalkReqVo = new DingTalkReqVo();
                    dingTalkReqVo.setTitle("财务系统驳回信息");
                    dingTalkReqVo.setNumber(sysUser.getPhonenumber());
                    dingTalkReqVo.setContents(contentList);
                    dingTalkService.sendNotification(dingTalkReqVo);
                }catch (Exception e){
                    log.error("差旅---财务系统驳回信息报错了", e);
                }
            }
            serviceReimbursement.setRecordstatus(RecordStatus);
@@ -804,7 +808,7 @@
        formmain_1209.put("卡号-作废", "");
        formmain_1209.put("支付方式", serviceReimbursement.getZffs());
        String lastApprovalInfo = getLastApprovalInfo(serviceFundflows, serviceReimbursement.getManagername());
        formmain_1209.put("组长",  lastApprovalInfo.contains("吴志强") ? null : lastApprovalInfo);
        formmain_1209.put("组长", lastApprovalInfo.contains("吴志强") ? null : lastApprovalInfo);
        formmain_1209.put("审批人员", getLastApprovalInfo(serviceFundflows, "陈慕华"));
        formmain_1209.put("支付日期", serviceReimbursement.getRiqi());
        formmain_1209.put("上传附件", "");