From f4ef6d1f4489e0d4cbba1845792945b924c16228 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期三, 14 十月 2026 18:29:56 +0800
Subject: [PATCH] feat: 客户签订合同统计 + MES 首页质检合格率
---
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/customer/CrmCustomerMapper.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/customer/CrmCustomerMapper.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/customer/CrmCustomerMapper.java
index 9e3935b..cb70ab8 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/customer/CrmCustomerMapper.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/customer/CrmCustomerMapper.java
@@ -56,10 +56,9 @@
default PageResult<CrmCustomerDO> selectPage(CrmCustomerPageReqVO pageReqVO, Long ownerUserId,
boolean superAdmin) {
MPJLambdaWrapperX<CrmCustomerDO> query = new MPJLambdaWrapperX<>();
- // 鍏捣鏌ヨ蹇呴』浼樺厛杩囨护锛屼笉鑳借鈥滃叏閮ㄦ暟鎹�濆満鏅粫杩囥��
+ // 鍏捣灞曠ず鍏佽鍏变韩鐨勫鎴凤紙鍖呭惈宸叉湁璐熻矗浜猴級锛屼笌瀹㈡埛绠＄悊浣跨敤鍚屼竴浠芥暟鎹��
if (Boolean.TRUE.equals(pageReqVO.getPool())) {
- query.isNull(CrmCustomerDO::getOwnerUserId)
- .eq(!superAdmin, CrmCustomerDO::getAutoPoolEnabled, true);
+ query.eq(!superAdmin, CrmCustomerDO::getAutoPoolEnabled, true);
} else if (CrmSceneTypeEnum.isAll(pageReqVO.getSceneType())) {
// 鍦烘櫙鍥涳細鍏ㄩ儴鏁版嵁锛屼笉鍖哄垎鍏捣/闈炲叕娴凤紝鐢� appendPermissionCondition 缁熶竴澶勭悊
CrmPermissionUtils.appendPermissionCondition(query, CrmBizTypeEnum.CRM_CUSTOMER.getType(),
@@ -93,6 +92,8 @@
throw new IllegalArgumentException("鏈煡鑱旂郴鐘舵�侊細" + pageReqVO.getContactStatus());
}
}
+ // 閲嶇偣瀹㈡埛锛圓/level=1锛夐粯璁ゆ帓鍦ㄥ墠闈�
+ query.orderByAsc(CrmCustomerDO::getLevel);
return selectJoinPage(pageReqVO, CrmCustomerDO.class, query);
}
@@ -213,7 +214,6 @@
default Long selectPoolCount() {
return selectCount(new LambdaQueryWrapperX<CrmCustomerDO>()
- .isNull(CrmCustomerDO::getOwnerUserId)
.eq(!CrmPermissionUtils.isSuperAdmin(), CrmCustomerDO::getAutoPoolEnabled, true));
}
--
Gitblit v1.9.3