#

LSH

2023-11-04 aa0161bf05195ccb00bc1d8da4b1b8218f93f4d3

 src/main/java/com/zy/crm/manager/controller/ReimburseOnlineController.java

@@ -74,7 +74,7 @@
        }

        // 步骤条相关
        resultObj.put("step", reimburseOnline.getSettle() == 6 ? 0 : reimburseOnline.getSettle() + 1);
        resultObj.put("step", reimburseOnline.getSettle() == 7 ? 0 : reimburseOnline.getSettle() + 1);

        return R.ok().add(resultObj);
    }
@@ -140,7 +140,13 @@
            }
        }
        if (!signUserId && !signDeptId){
            wrapper.eq("user_id", getUserId());
            if (getRole().getId()==1){
                wrapper.or().eq("host_id",1);
            }else if (getRole().getId()==2){
                wrapper.eq("dept_id",getDeptId());
            }else {
                wrapper.eq("user_id", getUserId());
            }
        }
        if (signHostId){
            wrapper.or().eq("host_id",1);
@@ -194,7 +200,7 @@
        User president6 = userService.selectById(processPermissions6.getUserId());       // 获取报价流程节点6确认人

        reimburseOnline.setSettleMsg(JSON.toJSONString(SettleDto.initPriQuote(reimburseOnline, manager,president3,president4,president5,president6,getUser())));
        reimburseOnline.setMemberId(getUser().getId());
        reimburseOnline.setMemberId(manager.getId());

        if (!reimburseOnlineService.insert(reimburseOnline)){
            return R.error("添加报销主档失败");