|
|
@@ -161,6 +161,7 @@ public class TimedTaskUtils {
|
|
|
}
|
|
|
//TODO 更新考核周期
|
|
|
partnerUserMapper.updateUpgradeCycleStartTime(partnerUser.getUserId(), PartnerDateUtils.addDaysToday(upgradeEndTime,1),partnerUser.getGrade());
|
|
|
+ partnerUserMapper.updateNextLevelAssessmentTime(partnerUser.getUserId(), (partnerUser.getGrade() + 1),PartnerDateUtils.addDaysToday(upgradeEndTime,1));
|
|
|
}
|
|
|
|
|
|
}
|
|
|
@@ -176,7 +177,9 @@ public class TimedTaskUtils {
|
|
|
queryWrapper.eq("identity_status", 0);
|
|
|
queryWrapper.in("grade", 2,3,4);
|
|
|
queryWrapper.orderByDesc("create_time");
|
|
|
- queryWrapper.notIn("id", idList);
|
|
|
+ if (CollectionUtil.isNotEmpty(idList)){
|
|
|
+ queryWrapper.notIn("id", idList);
|
|
|
+ }
|
|
|
List<PartnerUser> partnerUsers = partnerUserMapper.selectList(queryWrapper);
|
|
|
|
|
|
for (PartnerUser filteredUser : partnerUsers) {
|