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

Junjie

2023-11-10 cbc9250b33a955bc919a6afc5d4101ef65bbfafa

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

@@ -268,6 +268,10 @@
            return R.error("你无法接取此甲方单位!");
        }
        cstmr1.setDirector(getUserId());
        cstmr.setDeptId(getDeptId());               // 所属部门
        cstmr.setUserId(getUserId());               // 所属人员
        cstmr.setUpdateBy(getUserId());
        cstmr.setUpdateTime(new Date());
        cstmrService.updateById(cstmr1);
        return R.ok();
    }
@@ -280,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();
    }