BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 4a8d1464220c0c84fe115cc9517388e90ff8f662

Authored by YunaiV
1 parent 3924956f

fix:修复CRM模块待办列表和数据权限BUG。

Inline Side-by-side
Showing 2 changed files with 6 additions and 3 deletions
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/receivable/CrmReceivablePlanMapper.java
  View file @4a8d146
@@ -59,10 +59,12 @@ public interface CrmReceivablePlanMapper extends BaseMapperX<CrmReceivablePlanDO @@ -59,10 +59,12 @@ public interface CrmReceivablePlanMapper extends BaseMapperX<CrmReceivablePlanDO
59 59
60 // Backlog: 回款提醒类型 60 // Backlog: 回款提醒类型
61 LocalDateTime beginOfToday = LocalDateTimeUtil.beginOfDay(LocalDateTime.now()); 61 LocalDateTime beginOfToday = LocalDateTimeUtil.beginOfDay(LocalDateTime.now());
62 - if (CrmReceivablePlanPageReqVO.REMIND_TYPE_NEEDED.equals(pageReqVO.getRemindType())) { // 待回款。查询条件：未回款+提醒时间<=当前时间（反过来即当前时间>=提醒时间，已经到达提醒的时间点） 62 + if (CrmReceivablePlanPageReqVO.REMIND_TYPE_NEEDED.equals(pageReqVO.getRemindType())) { // 待回款
  63 + // 查询条件：未回款 + 提醒时间 <= 当前时间（反过来即当前时间 >= 提醒时间，已经到达提醒的时间点）
63 query.isNull(CrmReceivablePlanDO::getReceivableId) // 未回款 64 query.isNull(CrmReceivablePlanDO::getReceivableId) // 未回款
64 .le(CrmReceivablePlanDO::getRemindTime, beginOfToday); // 今天开始提醒 65 .le(CrmReceivablePlanDO::getRemindTime, beginOfToday); // 今天开始提醒
65 - } else if (CrmReceivablePlanPageReqVO.REMIND_TYPE_EXPIRED.equals(pageReqVO.getRemindType())) { // 已逾期。查询条件：未回款+回款时间<当前时间（反过来即当前时间>回款时间，已经过了回款时间点） 66 + } else if (CrmReceivablePlanPageReqVO.REMIND_TYPE_EXPIRED.equals(pageReqVO.getRemindType())) { // 已逾期
  67 + // 查询条件：未回款 + 回款时间 < 当前时间（反过来即当前时间 > 回款时间，已经过了回款时间点）
66 query.isNull(CrmReceivablePlanDO::getReceivableId) // 未回款 68 query.isNull(CrmReceivablePlanDO::getReceivableId) // 未回款
67 .lt(CrmReceivablePlanDO::getReturnTime, beginOfToday); // 已逾期 69 .lt(CrmReceivablePlanDO::getReturnTime, beginOfToday); // 已逾期
68 } else if (CrmReceivablePlanPageReqVO.REMIND_TYPE_RECEIVED.equals(pageReqVO.getRemindType())) { // 已回款 70 } else if (CrmReceivablePlanPageReqVO.REMIND_TYPE_RECEIVED.equals(pageReqVO.getRemindType())) { // 已回款
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/util/CrmPermissionUtils.java
  View file @4a8d146
@@ -60,7 +60,8 @@ public class CrmPermissionUtils { @@ -60,7 +60,8 @@ public class CrmPermissionUtils {
60 } 60 }
61 query.innerJoin(CrmPermissionDO.class, on -> on.eq(CrmPermissionDO::getBizType, bizType) 61 query.innerJoin(CrmPermissionDO.class, on -> on.eq(CrmPermissionDO::getBizType, bizType)
62 .eq(CrmPermissionDO::getBizId, bizId) 62 .eq(CrmPermissionDO::getBizId, bizId)
63 - .in(CrmPermissionDO::getLevel, CrmPermissionLevelEnum.READ.getLevel(), CrmPermissionLevelEnum.WRITE.getLevel()).eq(CrmPermissionDO::getUserId,userId)); 63 + .in(CrmPermissionDO::getLevel, CrmPermissionLevelEnum.READ.getLevel(), CrmPermissionLevelEnum.WRITE.getLevel())
  64 + .eq(CrmPermissionDO::getUserId,userId));
64 query.ne(ownerUserIdField, userId); 65 query.ne(ownerUserIdField, userId);
65 } 66 }
66 // 场景三：下属负责的数据（下属是负责人） 67 // 场景三：下属负责的数据（下属是负责人）