WxxyDeveloper/JSL_OrganizeInternalOA
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feature-zrx #24

Merged
XiaoLFeng merged 7 commits from feature-zrx into develop 2024-04-18 22:30:35 +08:00
Conversation 0 Commits 7 Files Changed 16 +4 -1
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f491d9a97f - Show all commits

5
src/main/java/com/jsl/oa/services/impl/ReviewServiceImpl.java
View File

@ -196,6 +196,7 @@ public class ReviewServiceImpl implements ReviewService {
if (!projectDAO.isExistProjectById(reviewAddVO.getProjectId())) { if (!projectDAO.isExistProjectById(reviewAddVO.getProjectId())) {
throw new BusinessException(ErrorCode.PROJECT_NOT_EXIST); throw new BusinessException(ErrorCode.PROJECT_NOT_EXIST);
} }
if (projectMapper.getProjectChildById( if (projectMapper.getProjectChildById(
Math.toIntExact(reviewAddVO.getProjectChildId())) != null) { Math.toIntExact(reviewAddVO.getProjectChildId())) != null) {
throw new BusinessException(ErrorCode.PROJECT_CHILD_NOT_EXIST); throw new BusinessException(ErrorCode.PROJECT_CHILD_NOT_EXIST);
@ -255,7 +256,6 @@ public class ReviewServiceImpl implements ReviewService {
} }
@Override @Override
public BaseResponse searchReview(String content, public BaseResponse searchReview(String content,
Short statue, Short statue,
@ -437,6 +437,9 @@ public class ReviewServiceImpl implements ReviewService {
reviewData.addAll(reviewDOS); reviewData.addAll(reviewDOS);
} }
// 获取自己的审核记录
List<ReviewDO> myReviewDO = reviewDAO.getReviewByUser(userId);
reviewData.addAll(myReviewDO);
//根据id进行去重 //根据id进行去重
reviewData = reviewData.stream() reviewData = reviewData.stream()