From c8f6f175a23e15b40309cf31850ee170d8d946ca Mon Sep 17 00:00:00 2001 From: liujie <1793218484@qq.com> Date: 星期二, 30 九月 2025 14:33:43 +0800 Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/haizhentong --- ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCrmClinicController.java | 22 +++++++++++++++++++++- 1 files changed, 21 insertions(+), 1 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCrmClinicController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCrmClinicController.java index e707db9..bd56489 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCrmClinicController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCrmClinicController.java @@ -68,9 +68,23 @@ public R<PageInfo<TCrmClinicVO>> pageList(@RequestBody TCrmClinicQuery query) { Integer roleType = tokenService.getLoginUser().getUser().getRoleType(); Long userId = tokenService.getLoginUser().getUserId(); - if(roleType == 2 || roleType == 3){ + if(roleType == 2){ query.setUserId(userId); query.setRoleType(roleType); + // 查询账号绑定的分公司 + TCrmBranch crmBranch = crmBranchService.getOne(Wrappers.lambdaQuery(TCrmBranch.class) + .eq(TCrmBranch::getUserId,userId) + .last("LIMIT 1")); + query.setBranchId(crmBranch.getId()); + } + if(roleType == 3){ + query.setUserId(userId); + query.setRoleType(roleType); + // 查询账号绑定的业务员 + TCrmSalesperson crmSalesperson = crmSalespersonService.getOne(Wrappers.lambdaQuery(TCrmSalesperson.class) + .eq(TCrmSalesperson::getUserId,userId) + .last("LIMIT 1")); + query.setSalespersonId(crmSalesperson.getId()); } return R.ok(crmClinicService.pageList(query)); } @@ -113,6 +127,12 @@ @ApiOperation(value = "添加crm诊所管理") @PostMapping(value = "/add") public R<Boolean> add(@Validated @RequestBody TCrmClinicDTO dto) { + Integer roleType = tokenService.getLoginUser().getUser().getRoleType(); + if (roleType == 1){ + dto.setStatus(3); + }else { + dto.setStatus(1); + } return crmClinicService.addClinic(dto); } -- Gitblit v1.7.1