瀏覽代碼

fix 用户资料更新

he2802 3 年之前
父節點
當前提交
6febe50320

+ 15 - 13
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserUpdateServiceImpl.java

@@ -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;
     }