liusheng
昨天 84a995c146ce6ab74709a503d010b03fb469e022
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java
@@ -519,21 +519,20 @@
        log.info("sserviceFund保存的的值是-------- :{}", aBoolean);
        //办公室审批通过之后,就需要把“办公室主任”的名字填上
        List<SysUser> sysUsers =null;
        SysUser sysUsers =null;
        if(StringUtils.isNotEmpty(user.getUserName())) {
            SysUser su = new SysUser();
            su.setUserName(user.getUserName());
           sysUsers = sysUserMapper.selectAllocatedList(su);
           sysUsers = sysUserMapper.selectUserByUserName(user.getUserName());
           log.info("费用sysUsers返回的值为:{}", sysUsers);
        }
        if (checkFundVO.getFlowconclusion() == 1 && sysUsers != null && !sysUsers.isEmpty()
                && sysUsers.get(0).getRoles() != null
                && sysUsers.get(0).getRoles().stream().anyMatch(role -> "officedirector".equals(role.getRoleKey()))) {
        if (checkFundVO.getFlowconclusion() == 1 && sysUsers != null
                && sysUsers.getRoles() != null
                && sysUsers.getRoles().stream().anyMatch(role -> "officedirector".equals(role.getRoleKey()))) {
            serviceFund.setOfficedirector(user.getNickName());
            serviceFund.setUploadStates(1);
            //数据发送
            Boolean aBoolean1 = null;
            if (newSwitch == 1) {
                log.info("费用newSwitch返回的值为:{}", newSwitch);
                //搞一个开关,别影响老流程
                aBoolean1 = sendData(serviceFund);
                if (!aBoolean1) {