|
|
@@ -34,7 +34,7 @@ public class IntellectualPropertyController extends BaseController {
|
|
|
public IntellectualProperty save(@RequestBody IntellectualProperty record) {
|
|
|
if (record.getId() != null) {
|
|
|
IntellectualProperty orig = intellectualPropertyRepo.findById(record.getId())
|
|
|
- .orElseThrow(new BusinessException("无记录"));
|
|
|
+ .orElseThrow(new BusinessException("无记录"));
|
|
|
ObjUtils.merge(orig, record);
|
|
|
return intellectualPropertyRepo.save(orig);
|
|
|
}
|
|
|
@@ -58,9 +58,9 @@ public class IntellectualPropertyController extends BaseController {
|
|
|
intellectualPropertyRepo.softDelete(id);
|
|
|
}
|
|
|
|
|
|
- @GetMapping("/excel")
|
|
|
+ @PostMapping("/excel")
|
|
|
@ResponseBody
|
|
|
- public void excel(HttpServletResponse response, PageQuery pageQuery) throws IOException {
|
|
|
+ public void excel(HttpServletResponse response, @RequestBody PageQuery pageQuery) throws IOException {
|
|
|
List<IntellectualProperty> data = all(pageQuery).getContent();
|
|
|
List<IntellectualPropertyDTO> dtoList = intellectualPropertyService.export(data);
|
|
|
ExcelUtils.export(response, dtoList);
|