|
@@ -158,19 +158,21 @@ public class UserUpdateServiceImpl extends ServiceImpl<UserUpdateMapper, UserUpd
|
|
|
lqw.orderByDesc(ClassGradeUser::getOfficialStatusTime);
|
|
|
lqw.last("limit 1");
|
|
|
ClassGradeUser classGradeUser = iClassGradeUserService.getOne(lqw);
|
|
|
- userUpdate.setLastApplyPushTime(classGradeUser.getOfficialStatusTime());
|
|
|
-
|
|
|
- lqw.clear();
|
|
|
- lqw.eq(Validator.isNotEmpty(userUpdate.getUserId()), ClassGradeUser::getUserId, userUpdate.getUserId());
|
|
|
- lqw.orderByDesc(ClassGradeUser::getPeriodPlushTime);
|
|
|
- lqw.last("limit 1");
|
|
|
- classGradeUser = iClassGradeUserService.getOne(lqw);
|
|
|
- userUpdate.setLastPeriodPlushTime(classGradeUser.getPeriodPlushTime());
|
|
|
-
|
|
|
- LambdaQueryWrapper<User> lq = Wrappers.lambdaQuery();
|
|
|
- lq.eq(Validator.isNotEmpty(userUpdate.getUserId()), User::getUserId, userUpdate.getUserId());
|
|
|
- User user = iUserService.getOne(lq);
|
|
|
- userUpdate.setNowRealname(user.getRealname());
|
|
|
+ if(Validator.isNotEmpty(classGradeUser)){
|
|
|
+ userUpdate.setLastApplyPushTime(classGradeUser.getOfficialStatusTime());
|
|
|
+
|
|
|
+ lqw.clear();
|
|
|
+ lqw.eq(Validator.isNotEmpty(userUpdate.getUserId()), ClassGradeUser::getUserId, userUpdate.getUserId());
|
|
|
+ lqw.orderByDesc(ClassGradeUser::getPeriodPlushTime);
|
|
|
+ lqw.last("limit 1");
|
|
|
+ classGradeUser = iClassGradeUserService.getOne(lqw);
|
|
|
+ userUpdate.setLastPeriodPlushTime(classGradeUser.getPeriodPlushTime());
|
|
|
+
|
|
|
+ LambdaQueryWrapper<User> lq = Wrappers.lambdaQuery();
|
|
|
+ lq.eq(Validator.isNotEmpty(userUpdate.getUserId()), User::getUserId, userUpdate.getUserId());
|
|
|
+ User user = iUserService.getOne(lq);
|
|
|
+ userUpdate.setNowRealname(user.getRealname());
|
|
|
+ }
|
|
|
});
|
|
|
return userUpdateVos;
|
|
|
}
|