Merge branch 'master' of http://116.62.18.175:6699/r/~yxh/opo

yxh

2026-07-21 5f32e2345148bcf51b0428e6039aa1981db22ccb

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

@@ -25,6 +25,7 @@
import com.ruoyi.project.domain.vo.SpFinancialExpensesReimbursementOut;
import com.ruoyi.project.mapper.*;
import com.ruoyi.project.service.*;
import com.ruoyi.system.mapper.SysUserMapper;
import com.ruoyi.system.mapper.SysUserRoleMapper;
import com.ruoyi.system.service.ISysPostService;
import com.ruoyi.system.service.ISysUserService;
@@ -81,6 +82,9 @@
    IServiceReimbursementpayeeService payeeService;

    @Autowired
    SysUserMapper sysUserMapper;

    @Autowired
    IServiceFundflowruleService serviceFundflowruleService;

    @Autowired
@@ -132,7 +136,7 @@
        if (serviceReimbursement.getCreateTime() != null) {
            wrappers.eq(ServiceReimbursement::getCreateTime, serviceReimbursement.getCreateTime());
        }
        if (StringUtils.isNotBlank(serviceReimbursement.getUsername())) {
        if (!serviceReimbursement.getUsername().equals("shenji")) {
            wrappers.like(ServiceReimbursement::getUsername, serviceReimbursement.getUsername());
        }
        if (StringUtils.isNotBlank(serviceReimbursement.getTravelers())) {
@@ -489,8 +493,18 @@
                }

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

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