1.新增保安员列表接口 2.行政区tree 接口修改

Administrator

2021-07-19 6224d1c19b5d92a2e5dd31eaa36d70fdfb0f5243

 src/main/java/org/springblade/modules/record/controller/RecordController.java

@@ -27,12 +27,15 @@
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.permit.entity.Permit;
import org.springblade.modules.record.entity.Record;
import org.springblade.modules.record.service.IRecordService;
import org.springblade.modules.record.vo.RecordVO;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;

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

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