diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingQuestionController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingQuestionController.java index 2aedf231..4c2526c4 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingQuestionController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingQuestionController.java @@ -32,6 +32,7 @@ import org.apache.poi.hssf.usermodel.HSSFSheet; import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.ss.util.CellRangeAddress; import org.apache.shiro.SecurityUtils; +import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import io.swagger.annotations.Api; @@ -91,6 +92,7 @@ public class PayMeetingQuestionController extends JeroController pageList = payMeetingQuestionService.page(page, lambdaQueryWrapper); return Result.ok(pageList); } + @RequiresPermissions("standardsMeeting:problemCollection:search") @AutoLog(value = "征集问题-分页列表查询 -一个会议所有标准号") @ApiOperation(value = "征集问题-分页列表查询 -一个会议所有标准号", notes = "征集问题-分页列表查询-一个会议所有标准号") @GetMapping(value = "/list") @@ -181,6 +183,7 @@ public class PayMeetingQuestionController extends JeroController questionList = payMeeting.getQuestionList(); + List list = payMeetingStandardService.list(new LambdaQueryWrapper().eq(PayMeetingStandard::getMeetingId, payMeeting.getId())); if(!org.springframework.util.CollectionUtils.isEmpty(questionList)) { - List list = payMeetingStandardService.list(new LambdaQueryWrapper().eq(PayMeetingStandard::getMeetingId, payMeeting.getId())); List ids = list.stream().map(PayMeetingStandard::getId).collect(Collectors.toList()); if(!org.springframework.util.CollectionUtils.isEmpty(list)) { ArrayList listNew = new ArrayList<>(); @@ -287,6 +287,8 @@ public class PayMeetingServiceImpl extends ServiceImpl collect = payMeeting.getQuestionList().stream().map(s -> s.setMeetingId(payMeeting.getId())).collect(Collectors.toList()); payMeetingStandardService.saveBatch(collect); } + }else if(!org.springframework.util.CollectionUtils.isEmpty(list)){ + payMeetingStandardService.remove(new LambdaQueryWrapper().eq(PayMeetingStandard::getMeetingId,payMeeting.getId())); } }