From b1643b619696f2578e22d7f3bcc2cacca63a1ce6 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期日, 26 五月 2024 22:26:25 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_backend
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZAutobiographyServiceImpl.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZAutobiographyServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZAutobiographyServiceImpl.java
index 6e8ee6e..aa19eb7 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZAutobiographyServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZAutobiographyServiceImpl.java
@@ -3,12 +3,15 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.domain.ZAutobiography;
import com.ruoyi.mapper.ZAutobiographyMapper;
import com.ruoyi.service.ZAutobiographyService;
import org.springframework.stereotype.Service;
+import java.util.Comparator;
import java.util.List;
+import java.util.stream.Collectors;
/**
* <p>
@@ -25,15 +28,21 @@
public List<ZAutobiography> selectAutobiographyList(Long userId) {
LambdaQueryWrapper<ZAutobiography> lqw = new LambdaQueryWrapper<>();
lqw.eq(ZAutobiography::getUserId,userId);
- return list(lqw);
+ List<ZAutobiography> result = list(lqw);
+ result.forEach(zAutobiography -> {
+ if (StringUtils.isEmpty(zAutobiography.getAgeBegin())){
+ throw new RuntimeException("鏈夋暟鎹殑璧峰骞撮緞娌℃湁濉�");
+ }
+ });
+ return result.stream().sorted(Comparator.comparingInt(z -> Integer.parseInt(z.getAgeBegin()))).collect(Collectors.toList());
}
@Override
- public List<ZAutobiography> listByTerm(Long userId,Integer termId) {
+ public List<ZAutobiography> listByTerm(Long userId,String term) {
LambdaQueryWrapper<ZAutobiography> lqw = new LambdaQueryWrapper<>();
lqw.eq(ZAutobiography::getUserId,userId);
- lqw.eq(ZAutobiography::getType,termId);
+ lqw.eq(ZAutobiography::getTerm,term);
return list(lqw);
}
}
--
Gitblit v1.9.1