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

Junjie

2023-11-10 cbc9250b33a955bc919a6afc5d4101ef65bbfafa

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

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

@@ -284,6 +284,11 @@
        }
        cstmr.setUpdateBy(getUserId());
        cstmr.setUpdateTime(new Date());
        if (!Cools.isEmpty(cstmr.getDirector())){
            User director = userService.selectById(cstmr.getDirector());
            cstmr.setDeptId(director.getDeptId());
            cstmr.setUserId(director.getId());
        }
        cstmrService.updateById(cstmr);
        return R.ok();
    }

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

@@ -246,7 +246,10 @@
        User userUp = userService.selectById(plan.getUserId());
        priOnline2.setAssistantHostSign(plan.getAssistantHostSign());
        priOnline2.setAssistantPlanId(plan.getAssistantPlanId());
        priOnline2.setHostPlanId(plan.getHostPlanId());
        priOnline2.setHostPlanId(plan.getId());
        if (plan.getAssistantHostSign()==1){
            priOnline2.setHostPlanId(plan.getHostPlanId());
        }


        //业务员

 src/main/webapp/static/js/priOnline2/priOnline.js

@@ -609,7 +609,7 @@
            case "uploadLink":
                // 打开弹窗
                // 构建带参数的内容
                var planIdSign = data.id;
                var planIdSign = data.itemId;
                if (data.assistantHostSign==1){
                    planIdSign = data.hostPlanId;
                }