代码提交

liusheng

昨天 84a995c146ce6ab74709a503d010b03fb469e022

 ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementServiceImpl.java

@@ -447,7 +447,8 @@
                map.put("审批人：", loginUser.getUser().getUserName());
                map.put("审批时间：", new Date());
                map.put("意见：", "不通过");
                if (StringUtils.isNotBlank(checkFundVO.getFlowcontent())) map.put("意见：", checkFundVO.getFlowcontent());
                if (StringUtils.isNotBlank(checkFundVO.getFlowcontent()))
                    map.put("意见：", checkFundVO.getFlowcontent());
                contentList.add(map);
                DingTalkReqVo dingTalkReqVo = new DingTalkReqVo();
                dingTalkReqVo.setTitle("财务系统驳回信息");
@@ -494,22 +495,19 @@

            }
            //办公室主任审批通过之后，就需要把“办公室主任”的名字填上
            List<SysUser> sysUsers =null;
            SysUser sysUser = null;
            if(StringUtils.isNotEmpty(user.getUserName())) {
                SysUser su = new SysUser();
                su.setUserName(user.getUserName());
                sysUsers = sysUserMapper.selectAllocatedList(su);
                log.info("差旅sysUsers返回的值为:{}", sysUsers);
                sysUser = sysUserMapper.selectUserByUserName(user.getUserName());
                log.info("差旅sysUsers返回的值为:{}", sysUser);
            }

            if (checkFundVO.getFlowconclusion() == 1  && !sysUsers.isEmpty()
                    && sysUsers.get(0).getRoles() != null
                    && sysUsers.get(0).getRoles().stream().anyMatch(role -> "officedirector".equals(role.getRoleKey()))){
            if (checkFundVO.getFlowconclusion() == 1 && Objects.nonNull(sysUser) && sysUser.getRoles() != null && sysUser.getRoles().stream().anyMatch(role -> "officedirector".equals(role.getRoleKey()))) {
                serviceReimbursement.setOfficedirector(user.getNickName());
                serviceReimbursement.setUploadStates(1);

                Boolean aBoolean1 = null;
                if (newSwitch == 1) {
                    log.info("差旅newSwitch返回的值为:{}", newSwitch);
                    aBoolean1 = sendData(serviceReimbursement);
                    if (!aBoolean1) {
                        allMap.put("500", "发送失败");