|
|
@@ -319,6 +319,9 @@ public class LifeUserViolationServiceImpl extends ServiceImpl<LifeUserViolationM
|
|
|
IPage<LifeUserViolation> iPage = new Page<>(page, size);
|
|
|
QueryWrapper<LifeUserViolation> queryWrapper = new QueryWrapper<>();
|
|
|
queryWrapper.eq(StringUtils.isNotEmpty(processingStatus), PROCESSING_STATUS, processingStatus).and(flag, wrapper -> wrapper.nested(wq -> wq.eq(REPORTING_USER_TYPE, "1").in(!MIDs.isEmpty(), REPORTING_USER_ID, MIDs)).or(wq -> wq.eq(REPORTING_USER_TYPE, "2").in(!UIDs.isEmpty(), REPORTING_USER_ID, UIDs))).orderByDesc("updated_time");
|
|
|
+ String commonReportContextType = "1,2,3";
|
|
|
+ List<String> commonReportContextTypeList = Arrays.asList(commonReportContextType.split(","));
|
|
|
+ queryWrapper.lambda().in(LifeUserViolation::getReportContextType, commonReportContextTypeList);
|
|
|
IPage<LifeUserViolation> resultPage = lifeUserViolationMapper.selectPage(iPage, queryWrapper);
|
|
|
return resultPage.convert(e -> {
|
|
|
LifeUserViolationDto dto = new LifeUserViolationDto();
|