wangli/nanopart
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(REQ-2106): 临时调试

Browse Source
This commit is contained in:
chenwenjian 2024-04-07 18:37:34 +08:00
parent 8d3c11c613
commit 33c7d71225
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
banner/banner-server/src/main/java/cn/axzo/nanopart/server/service/impl/MaterialServiceImpl.java
View File

@ -189,26 +189,26 @@ public class MaterialServiceImpl extends ServiceImpl<MaterialDao, Material> impl
* @return {@link LambdaQueryChainWrapper}
*/
private LambdaQueryChainWrapper<Material> buildListByBannerCodeQueryWrapper(ListMaterialByBannerCodeReq req) {
// jobCodes必须搭配workspaceId是和ouId使用
if (CollectionUtils.isEmpty(req.getWorkspaceIds()) && CollectionUtils.isEmpty(req.getOuIds())
&& !CollectionUtils.isEmpty(req.getJobCodes())) {
throw new ServiceException("请指定需要查询的项目部或单位");
}
if (!CollectionUtils.isEmpty(req.getWorkspaceIds()) && !req.getWorkspaceIds().contains(0L)) {
req.getWorkspaceIds().add(0L);
}
if (!CollectionUtils.isEmpty(req.getOuIds()) && !req.getOuIds().contains(0L)) {
req.getOuIds().add(0L);
}
if (!CollectionUtils.isEmpty(req.getJobCodes()) && !req.getJobCodes().contains("0")) {
req.getJobCodes().add("0");
}
// // jobCodes必须搭配workspaceId是和ouId使用
// if (CollectionUtils.isEmpty(req.getWorkspaceIds()) && CollectionUtils.isEmpty(req.getOuIds())
// && !CollectionUtils.isEmpty(req.getJobCodes())) {
// throw new ServiceException("请指定需要查询的项目部或单位");
// }
// if (!CollectionUtils.isEmpty(req.getWorkspaceIds()) && !req.getWorkspaceIds().contains(0L)) {
// req.getWorkspaceIds().add(0L);
// }
// if (!CollectionUtils.isEmpty(req.getOuIds()) && !req.getOuIds().contains(0L)) {
// req.getOuIds().add(0L);
// }
// if (!CollectionUtils.isEmpty(req.getJobCodes()) && !req.getJobCodes().contains("0")) {
// req.getJobCodes().add("0");
// }
LambdaQueryChainWrapper<Material> chainWrapper = lambdaQuery()
.eq(Material::getBannerCode, req.getBannerCode())
.in(Material::getWorkspaceIds, req.getWorkspaceIds())
.in(Material::getOuIds, req.getOuIds())
.in(Material::getJobCodes, req.getJobCodes())
.eq(Objects.nonNull(req.getStatus()), Material::getStatus, req.getStatus())
// .in(Material::getWorkspaceIds, req.getWorkspaceIds())
// .in(Material::getOuIds, req.getOuIds())
// .in(Material::getJobCodes, req.getJobCodes())
// .eq(Objects.nonNull(req.getStatus()), Material::getStatus, req.getStatus())
.orderByAsc(Material::getPriority)
.orderByDesc(Material::getCreateAt);
// 查询有效期内的素材