1.机构树数据

tangzy

2021-07-15 65342a7bdf0aebc581ce51dc08c65d1c3b6d33dd

 src/main/java/org/springblade/modules/permit/controller/PermitController.java

@@ -30,10 +30,13 @@
import org.springblade.modules.permit.entity.Permit;
import org.springblade.modules.permit.service.IPermitService;
import org.springblade.modules.permit.vo.PermitVO;
import org.springblade.modules.punish.entity.Punish;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;

import javax.validation.Valid;
import java.util.Date;
import java.util.Map;

/**
 *  控制器
@@ -66,8 +69,8 @@
   @GetMapping("/list")
   @ApiOperationSupport(order = 2)
   @ApiOperation(value = "分页", notes = "传入permit")
   public R<IPage<Permit>> list(Permit permit, Query query) {
      IPage<Permit> pages = permitService.page(Condition.getPage(query), Condition.getQueryWrapper(permit));
   public R<IPage<Permit>> list(@ApiIgnore @RequestParam Map<String, Object> permit, Query query) {
      IPage<Permit> pages = permitService.page(Condition.getPage(query), Condition.getQueryWrapper(permit, Permit.class));
      return R.data(pages);
   }