Merge remote-tracking branch 'origin/zycrm' into zycrm

Junjie

2023-11-08 7f9d058a0e632be6a3daf6f46d26b69742db0720

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

@@ -277,6 +277,7 @@
        users.add(userUp);
        priOnline2.setSettleMsg(JSON.toJSONString(SettleDto.InItFlowPath(users, initNames, users.size())));
        priOnline2.setSettleSize(users.size());
        priOnline2.setPlanId(plan.getId());

        //设置项目流程
        plan.setStep(2);
@@ -593,8 +594,8 @@
                }
                dto.setTime(DateUtils.convert(new Date()));
            } else if (dto.getStep().equals(priOnline2.getSettle() + 2)) {
                if (priOnline2.getSettleSize().equals(4)){
                    nextUserId = 0L;
                if (Cools.isEmpty(dto.getUserId())){
                    nextUserId= 0L;
                }else {
                    nextUserId=dto.getUserId();
                }