bug修改

xuhy

2025-12-09 4cb4eba2d43f732907e4ccd73c43fca919bb5d6d

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCrmBranchController.java

@@ -91,7 +91,9 @@
    @PostMapping(value = "/pageList")
    public R<PageInfo<TCrmBranchVO>> pageList(@RequestBody TCrmBranchQuery query) {
        Integer roleType = tokenService.getLoginUser().getUser().getRoleType();
        Long userId = tokenService.getLoginUser().getUserId();
        query.setRoleType(roleType);
        query.setUserId(userId);
        return R.ok(crmBranchService.pageList(query));
    }

@@ -121,6 +123,28 @@
    public R<List<TCrmBranch>> listProvince(@RequestParam Integer personType) {
        List<TCrmBranch> crmBranches = crmBranchService.list(Wrappers.lambdaQuery(TCrmBranch.class)
                .eq(TCrmBranch::getPersonType, personType)
                .eq(TCrmBranch::getStatus, 1)
                .orderByDesc(TCrmBranch::getCreateTime));
        return R.ok(crmBranches);
    }

    /**
     * 获取crm分公司管理管理列表
     */
    @ApiOperation(value = "获取crm分公司地区经理，城市经理管理列表")
    @GetMapping(value = "/listCity")
    public R<List<TCrmBranch>> listCity() {
        Long userId = tokenService.getLoginUser().getUserId();
        TCrmBranch crmBranch = crmBranchService.getOne(Wrappers.lambdaQuery(TCrmBranch.class)
                .eq(TCrmBranch::getUserId, userId)
                .eq(TCrmBranch::getPersonType, 1)
                .eq(TCrmBranch::getStatus, 1)
                .last("LIMIT 1"));
        if(Objects.isNull(crmBranch)){
            return R.ok(new ArrayList<>());
        }
        List<TCrmBranch> crmBranches = crmBranchService.list(Wrappers.lambdaQuery(TCrmBranch.class)
                .eq(TCrmBranch::getProvinceBranchId, crmBranch.getId())
                .eq(TCrmBranch::getStatus, 1)
                .orderByDesc(TCrmBranch::getCreateTime));
        return R.ok(crmBranches);
@@ -394,7 +418,7 @@
        }

        TCrmBranchLift crmBranchLift = new TCrmBranchLift();
        crmBranchLift.setBranchId(crmBranch.getId());
        crmBranchLift.setBranchId(dto.getBranchId());
        crmBranchLift.setChargePhone(dto.getChargePhone());
        crmBranchLift.setLiftReason(dto.getLiftReason());
        crmBranchLiftService.save(crmBranchLift);