!1140 【轻量级PR】：修复CRM模块待办列表和数据权限BUG。

Merge pull request !1140 from panjiabao/develop

yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/receivable/CrmReceivablePlanMapper.java

@@ -59,13 +59,12 @@ public interface CrmReceivablePlanMapper extends BaseMapperX<CrmReceivablePlanDO
 
         // Backlog: 回款提醒类型
         LocalDateTime beginOfToday = LocalDateTimeUtil.beginOfDay(LocalDateTime.now());
-        if (CrmReceivablePlanPageReqVO.REMIND_TYPE_NEEDED.equals(pageReqVO.getRemindType())) { // 待回款
+        if (CrmReceivablePlanPageReqVO.REMIND_TYPE_NEEDED.equals(pageReqVO.getRemindType())) { // 待回款。查询条件：未回款+提醒时间<=当前时间（反过来即当前时间>=提醒时间，已经到达提醒的时间点）
             query.isNull(CrmReceivablePlanDO::getReceivableId) // 未回款
-                    .lt(CrmReceivablePlanDO::getReturnTime, beginOfToday) // 已逾期
-                    .lt(CrmReceivablePlanDO::getRemindTime, beginOfToday); // 今天开始提醒
-        } else if (CrmReceivablePlanPageReqVO.REMIND_TYPE_EXPIRED.equals(pageReqVO.getRemindType())) {  // 已逾期
+                    .le(CrmReceivablePlanDO::getRemindTime, beginOfToday); // 今天开始提醒
+        } else if (CrmReceivablePlanPageReqVO.REMIND_TYPE_EXPIRED.equals(pageReqVO.getRemindType())) {  // 已逾期。查询条件：未回款+回款时间<当前时间（反过来即当前时间>回款时间，已经过了回款时间点）
             query.isNull(CrmReceivablePlanDO::getReceivableId) // 未回款
-                    .ge(CrmReceivablePlanDO::getReturnTime, beginOfToday); // 已逾期
+                    .lt(CrmReceivablePlanDO::getReturnTime, beginOfToday); // 已逾期
         } else if (CrmReceivablePlanPageReqVO.REMIND_TYPE_RECEIVED.equals(pageReqVO.getRemindType())) { // 已回款
             query.isNotNull(CrmReceivablePlanDO::getReceivableId);
         }

yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/util/CrmPermissionUtils.java

@@ -60,7 +60,7 @@ public class CrmPermissionUtils {
             }
             query.innerJoin(CrmPermissionDO.class, on -> on.eq(CrmPermissionDO::getBizType, bizType)
                     .eq(CrmPermissionDO::getBizId, bizId)
-                    .in(CrmPermissionDO::getLevel, CrmPermissionLevelEnum.READ.getLevel(), CrmPermissionLevelEnum.WRITE.getLevel()));
+                    .in(CrmPermissionDO::getLevel, CrmPermissionLevelEnum.READ.getLevel(), CrmPermissionLevelEnum.WRITE.getLevel()).eq(CrmPermissionDO::getUserId,userId));
             query.ne(ownerUserIdField, userId);
         }
         // 场景三：下属负责的数据（下属是负责人）