BJ_ZTEITS-Developers / parking-cloud-yudao

Commit b478eb9f08cad8e86bae5cfba25507a0f7002e93

Authored by panjiabao
1 parent cac51882

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

Inline Side-by-side
Showing 2 changed files with 5 additions and 6 deletions
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/receivable/CrmReceivablePlanMapper.java
  View file @b478eb9
@@ -59,13 +59,12 @@ public interface CrmReceivablePlanMapper extends BaseMapperX<CrmReceivablePlanDO @@ -59,13 +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 query.isNull(CrmReceivablePlanDO::getReceivableId) // 未回款 63 query.isNull(CrmReceivablePlanDO::getReceivableId) // 未回款
64 - .lt(CrmReceivablePlanDO::getReturnTime, beginOfToday) // 已逾期  
65 - .lt(CrmReceivablePlanDO::getRemindTime, beginOfToday); // 今天开始提醒  
66 - } else if (CrmReceivablePlanPageReqVO.REMIND_TYPE_EXPIRED.equals(pageReqVO.getRemindType())) { // 已逾期 64 + .le(CrmReceivablePlanDO::getRemindTime, beginOfToday); // 今天开始提醒
  65 + } else if (CrmReceivablePlanPageReqVO.REMIND_TYPE_EXPIRED.equals(pageReqVO.getRemindType())) { // 已逾期。查询条件：未回款+回款时间<当前时间（反过来即当前时间>回款时间，已经过了回款时间点）
67 query.isNull(CrmReceivablePlanDO::getReceivableId) // 未回款 66 query.isNull(CrmReceivablePlanDO::getReceivableId) // 未回款
68 - .ge(CrmReceivablePlanDO::getReturnTime, beginOfToday); // 已逾期 67 + .lt(CrmReceivablePlanDO::getReturnTime, beginOfToday); // 已逾期
69 } else if (CrmReceivablePlanPageReqVO.REMIND_TYPE_RECEIVED.equals(pageReqVO.getRemindType())) { // 已回款 68 } else if (CrmReceivablePlanPageReqVO.REMIND_TYPE_RECEIVED.equals(pageReqVO.getRemindType())) { // 已回款
70 query.isNotNull(CrmReceivablePlanDO::getReceivableId); 69 query.isNotNull(CrmReceivablePlanDO::getReceivableId);
71 } 70 }
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/util/CrmPermissionUtils.java
  View file @b478eb9
@@ -60,7 +60,7 @@ public class CrmPermissionUtils { @@ -60,7 +60,7 @@ 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())); 63 + .in(CrmPermissionDO::getLevel, CrmPermissionLevelEnum.READ.getLevel(), CrmPermissionLevelEnum.WRITE.getLevel()).eq(CrmPermissionDO::getUserId,userId));
64 query.ne(ownerUserIdField, userId); 64 query.ne(ownerUserIdField, userId);
65 } 65 }
66 // 场景三：下属负责的数据（下属是负责人） 66 // 场景三：下属负责的数据（下属是负责人）