sgb/zsw-farm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

我参与项目 排序

Browse Source
This commit is contained in:
小久哥
2022-06-16 14:58:50 +08:00
parent b36951a4fb
commit 79b5eb0836
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/service/project/ProjectServiceImpl.java
+2 -4
View File
@@ -153,7 +153,6 @@ public class ProjectServiceImpl implements ProjectService {
LocalDateTime startTime = pageDTO.getTimeLimit() == 2 ? nowTime.minusDays(3) : nowTime.minusDays(14); LocalDateTime startTime = pageDTO.getTimeLimit() == 2 ? nowTime.minusDays(3) : nowTime.minusDays(14);
queryWrapperX.between(ProjectDO::getCreateTime, startTime, nowTime); queryWrapperX.between(ProjectDO::getCreateTime, startTime, nowTime);
} }
queryWrapperX.eqIfPresent(ProjectDO::getDraft, pageDTO.getDraft()); queryWrapperX.eqIfPresent(ProjectDO::getDraft, pageDTO.getDraft());
if (pageDTO.getDraft()){ if (pageDTO.getDraft()){
//查看自己的草稿 //查看自己的草稿
@@ -165,11 +164,10 @@ public class ProjectServiceImpl implements ProjectService {
CpUserDO user = cpUserMapper.selectOne(Wrappers.<CpUserDO>lambdaQuery().eq(CpUserDO::getUserId, adminUser.getUsername())); CpUserDO user = cpUserMapper.selectOne(Wrappers.<CpUserDO>lambdaQuery().eq(CpUserDO::getUserId, adminUser.getUsername()));
if (ObjectUtil.isNotEmpty(user)){ if (ObjectUtil.isNotEmpty(user)){
//查看我参与或创建的项目 //查看我参与或创建的项目
queryWrapperX.last(" and (JSON_CONTAINS(members, '"+ user.getId()+"') or creator = " + getLoginUserId() +") ORDER BY id") ; queryWrapperX.apply(" ((JSON_CONTAINS(members, '"+ user.getId()+"') or creator = " + getLoginUserId() +"))");
} }
}else{
queryWrapperX.orderByDesc(ProjectDO::getId);
} }
queryWrapperX.orderByDesc(ProjectDO::getId);
List<ProjectDO> list = projectMapper.selectList(queryWrapperX); List<ProjectDO> list = projectMapper.selectList(queryWrapperX);
if (ObjectUtil.isEmpty(list)){ if (ObjectUtil.isEmpty(list)){