feat(customer): 添加公海客户归属查看权限控制

云

昨天 8438d50aef0bb78e5e6c41ca1c1bc09b4e61add1

 src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java

@@ -130,7 +130,8 @@
    public IPage<CustomerVo> selectCustomerList(Page<CustomerDto> page, CustomerDto customer) {
        LoginUser loginUser = SecurityUtils.getLoginUser();
        Long loginUserId = loginUser.getUserId();
        IPage<CustomerVo> customerPage = customerMapper.listPage(page, customer, loginUserId);
        boolean isAdmin = SecurityUtils.hasPermi("customer:viewAll");
        IPage<CustomerVo> customerPage = customerMapper.listPage(page, customer, loginUserId, isAdmin);

        List<CustomerVo> records = customerPage.getRecords();
        if (CollectionUtils.isEmpty(records)) {
@@ -199,7 +200,21 @@
        LoginUser loginUser = SecurityUtils.getLoginUser();
        Long tenantId = loginUser.getTenantId();
        customer.setTenantId(tenantId);
        return customerMapper.insert(customer);
        int result = customerMapper.insert(customer);

        // 私海新增时同步一条到公海
        if (customer.getType() != null && customer.getType() == 0) {
            Customer publicSeaCustomer = new Customer();
            BeanUtils.copyProperties(customer, publicSeaCustomer);
            publicSeaCustomer.setId(null);
            publicSeaCustomer.setType(1);
            publicSeaCustomer.setIsAssigned(0);
            publicSeaCustomer.setUsageUser(loginUser.getUserId());
            publicSeaCustomer.setUsageStatus(1L);
            customerMapper.insert(publicSeaCustomer);
        }

        return result;
    }

    /**
@@ -281,7 +296,8 @@
    public List<CustomerVo> selectCustomerLists(CustomerDto customer) {
        LoginUser loginUser = SecurityUtils.getLoginUser();
        Long loginUserId = loginUser.getUserId();
        return customerMapper.list(customer, loginUserId);
        boolean isAdmin = SecurityUtils.hasPermi("customer:viewAll");
        return customerMapper.list(customer, loginUserId, isAdmin);
    }

    @Override
@@ -310,18 +326,27 @@

    @Override
    public List<Map<String, Object>> customerList(Customer customer) {
        LambdaQueryWrapper<Customer> queryWrapper = Wrappers.lambdaQuery();
        queryWrapper.select(Customer::getId, Customer::getCustomerName, Customer::getTaxpayerIdentificationNumber);
        LoginUser loginUser = SecurityUtils.getLoginUser();
        Long loginUserId = loginUser.getUserId();
        boolean isAdmin = SecurityUtils.hasPermi("customer:viewAll");
        CustomerDto query = new CustomerDto();
        if (customer != null) {
            BeanUtils.copyProperties(customer, query);
        }

        // 获取原始查询结果
        List<Map<String, Object>> result = customerMapper.selectMaps(queryWrapper);
        // 复用客户列表的可见性规则，避免把别人的私海客户暴露给当前账号
        List<CustomerVo> visibleCustomers = customerMapper.list(query, loginUserId, isAdmin);
        if (CollectionUtils.isEmpty(visibleCustomers)) {
            return Collections.emptyList();
        }

        // 将下划线命名转换为驼峰命名
        return result.stream().map(map -> map.entrySet().stream()
                .collect(Collectors.toMap(
                        entry -> underlineToCamel(entry.getKey()),
                        Map.Entry::getValue))
        ).collect(Collectors.toList());
        return visibleCustomers.stream().map(item -> {
            Map<String, Object> map = new LinkedHashMap<>();
            map.put("id", item.getId());
            map.put("customerName", item.getCustomerName());
            map.put("taxpayerIdentificationNumber", item.getTaxpayerIdentificationNumber());
            return map;
        }).collect(Collectors.toList());
    }

    // 分配公海客户给私海