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 | 31 ++++++++++++++++++++++++++++++- 1 files changed, 30 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 4a5c4b7..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 @@ -8,6 +8,7 @@ import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.framework.web.service.TokenService; import com.ruoyi.system.dto.TCrmClinicAuditDTO; import com.ruoyi.system.dto.TCrmClinicDTO; import com.ruoyi.system.model.*; @@ -46,8 +47,9 @@ private final TCrmSalespersonService crmSalespersonService; private final ISysUserService sysUserService; private final TCrmDeviceService crmDeviceService; + private final TokenService tokenService; @Autowired - public TCrmClinicController(TCrmClinicService crmClinicService, TCrmSupplierService crmSupplierService, TCrmBranchService crmBranchService, TCrmWarehouseService crmWarehouseService, TCrmSalespersonService crmSalespersonService, ISysUserService sysUserService, TCrmDeviceService crmDeviceService) { + public TCrmClinicController(TCrmClinicService crmClinicService, TCrmSupplierService crmSupplierService, TCrmBranchService crmBranchService, TCrmWarehouseService crmWarehouseService, TCrmSalespersonService crmSalespersonService, ISysUserService sysUserService, TCrmDeviceService crmDeviceService, TokenService tokenService) { this.crmClinicService = crmClinicService; this.crmSupplierService = crmSupplierService; this.crmBranchService = crmBranchService; @@ -55,6 +57,7 @@ this.crmSalespersonService = crmSalespersonService; this.sysUserService = sysUserService; this.crmDeviceService = crmDeviceService; + this.tokenService = tokenService; } /** @@ -63,6 +66,26 @@ @ApiOperation(value = "获取crm诊所管理分页列表") @PostMapping(value = "/pageList") public R<PageInfo<TCrmClinicVO>> pageList(@RequestBody TCrmClinicQuery query) { + Integer roleType = tokenService.getLoginUser().getUser().getRoleType(); + Long userId = tokenService.getLoginUser().getUserId(); + 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)); } @@ -104,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