From 004e1229ed36a98cc3bb9e3c0eb15be2ab8c0642 Mon Sep 17 00:00:00 2001
From: 克 刘 <4345453@qq.com>
Date: Thu, 16 Apr 2020 11:16:49 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/BusinessRecordsController.java | 32 ++++++++++++++++++--------------
1 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/BusinessRecordsController.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/BusinessRecordsController.java
index ab9105c..15eb96a 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/BusinessRecordsController.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/BusinessRecordsController.java
@@ -20,6 +20,7 @@
/**
* 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
+ *
* @Description: 业务操作记录
* @Project: 运营中心
* @CreateDate: Created in 2020-04-02 18:25:34 <br>
@@ -30,7 +31,7 @@
@RestController
@RequestMapping("/businessrecords")
@Api(tags = "业务操作记录")
-public class BusinessRecordsController extends BaseController{
+public class BusinessRecordsController extends BaseController {
@Autowired
private IBusinessRecordsService businessRecordsService;
@@ -44,9 +45,9 @@
})
@GetMapping
public PageResult list(@RequestParam Map<String, Object> params) {
- if(params.size()==0){
- params.put("page",1);
- params.put("limit",10);
+ if (params.size() == 0) {
+ params.put("page", 1);
+ params.put("limit", 10);
}
return businessRecordsService.findList(params);
}
@@ -80,12 +81,16 @@
if (bindingResult.hasErrors()) {
return ResultBody.failed().msg(bindingResult.getFieldError().getDefaultMessage());
} else {
- boolean v= businessRecordsService.saveOrUpdate(businessRecords);
- if(v) {
- return ResultBody.ok().data(businessRecords).msg("保存成功");
- }
- else {
- return ResultBody.failed().msg("保存失败");
+ BusinessRecords model = businessRecordsService.getById(businessRecords.getId());
+ if (model == null) {
+ boolean v = businessRecordsService.saveOrUpdate(businessRecords);
+ if (v) {
+ return ResultBody.ok().data(businessRecords).msg("保存成功");
+ } else {
+ return ResultBody.failed().msg("保存失败");
+ }
+ } else {
+ return ResultBody.failed().msg("业务日志不允许更新！");
}
}
}
@@ -96,11 +101,10 @@
@ApiOperation(value = "删除")
@DeleteMapping("/{id}")
public ResultBody delete(@PathVariable Long id) {
- boolean v= businessRecordsService.removeById(id);
- if(v) {
+ boolean v = businessRecordsService.removeById(id);
+ if (v) {
return ResultBody.ok().msg("删除成功");
- }
- else {
+ } else {
return ResultBody.failed().msg("删除失败");
}
}
--
Gitblit v1.8.0