Merge remote-tracking branch 'origin/master'

alien-store/src/main/java/shop/alien/store/controller/ActivityInviteConfigController.java

@@ -71,7 +71,7 @@ public class ActivityInviteConfigController {
     @ApiOperation("获取邀请活动详情")
     @ApiOperationSupport(order = 3)
     @GetMapping("/getInviteActivitySignInConfigById")
-    public R<ActivityInviteConfigVo> getInviteActivitySignInConfigById(@RequestParam(required = true) Long activityId) {
+    public R<ActivityInviteConfigVo> getInviteActivitySignInConfigById(@RequestParam(required = false) Long activityId) {
         log.info("ActivityConfigController.getActivitySignInConfigById={}", activityId);
         ActivityInviteConfigVo activityConfigVO = activityInviteConfigService.getInviteActivitySignInConfigById(activityId);
         return R.data(activityConfigVO);

alien-store/src/main/java/shop/alien/store/service/impl/ActivityInviteConfigServiceImpl.java

@@ -86,8 +86,19 @@ public class ActivityInviteConfigServiceImpl extends ServiceImpl<ActivityInviteC
 
     @Override
     public ActivityInviteConfigVo getInviteActivitySignInConfigById(Long id) {
+        ActivityInviteConfig activityInviteConfig = new ActivityInviteConfig();
+        if(id != null && id > 0){
+            activityInviteConfig = activityInviteConfigMapper.selectById(id);
+        } else {
+            LambdaQueryWrapper<ActivityInviteConfig> activityInviteConfigLambdaQueryWrapper = new LambdaQueryWrapper<>();
+            activityInviteConfigLambdaQueryWrapper.eq(ActivityInviteConfig::getDeleteFlag, 0);
+            activityInviteConfigLambdaQueryWrapper.orderByDesc(ActivityInviteConfig::getCreatedTime);
+            List<ActivityInviteConfig> activityInviteConfigList = activityInviteConfigMapper.selectList(activityInviteConfigLambdaQueryWrapper);
+            if(CollectionUtils.isNotEmpty(activityInviteConfigList)){
+                activityInviteConfig = activityInviteConfigList.get(0);
+            }
+        }
         ActivityInviteConfigVo activityInviteConfigVo = new ActivityInviteConfigVo();
-        ActivityInviteConfig activityInviteConfig = activityInviteConfigMapper.selectById(id);
         BeanUtils.copyProperties(activityInviteConfig, activityInviteConfigVo);
         return activityInviteConfigVo;
     }

alien-store/src/main/java/shop/alien/store/service/impl/LifeUserViolationServiceImpl.java

@@ -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();