From a8bf44754f50d0b0a65f0f2d4beefc131261e35d Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Wed, 24 Jun 2020 16:53:47 +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/SysProductController.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/SysProductController.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/SysProductController.java
index c56f27d..7d046b5 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/SysProductController.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/SysProductController.java
@@ -4,6 +4,7 @@
import com.kidgrow.common.controller.BaseController;
import com.kidgrow.common.model.PageResult;
import com.kidgrow.common.model.ResultBody;
+import com.kidgrow.common.model.SysOrganization;
import com.kidgrow.common.model.SysUser;
import com.kidgrow.oprationcenter.model.ProductOrderDetail;
import com.kidgrow.oprationcenter.model.SysProduct;
@@ -86,7 +87,7 @@
*/
@ApiOperation(value = "保存")
@PostMapping
- public ResultBody save(@Valid @RequestBody SysProduct sysProduct, BindingResult bindingResult) {
+ public ResultBody save(@Valid @RequestBody SysProduct sysProduct, BindingResult bindingResult,@LoginUser SysUser sysUser) {
List<String> errMsg= new ArrayList<>();
if (bindingResult.hasErrors()) {
for (ObjectError error : bindingResult.getAllErrors()) {
@@ -94,6 +95,11 @@
}
return ResultBody.failed().msg(errMsg.toString());
} else {
+ List<SysOrganization> organizations = sysUser.getOrganizations();
+ if(organizations.size()>0){
+ sysProduct.setCreateUserOrgCode(organizations.get(organizations.size()-1).getOrgCode());
+ }
+
boolean v= sysProductService.saveOrUpdate(sysProduct);
if(v) {
return ResultBody.ok().data(sysProduct).msg("保存成功");
--
Gitblit v1.8.0