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

Junjie

2023-11-10 bb71b47a43244e6db57cbc3cd0223bc5a64023d7

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

@@ -127,7 +127,7 @@
                deptId = getDeptId();
                userId = null;
            }
            director = getUserId();
//            director = getUserId();
        }

        return R.ok(cstmrService.getPage3(new Page<>(curr, limit)
@@ -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();
    }