From 93cec81bc04d7722e8c82d699f434709d5dd47ce Mon Sep 17 00:00:00 2001
From: dougang <78125310@kidgrow.com>
Date: Fri, 18 Dec 2020 13:35:19 +0800
Subject: [PATCH] 修改模板下载
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/SysProductController.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 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..0583022 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;
@@ -60,7 +61,10 @@
}
return sysProductService.findList(params,sysUser);
}
-
+ @GetMapping("/all")
+ public PageResult allList(@RequestParam Map<String, Object> params, @LoginUser SysUser sysUser) {
+ return sysProductService.findAllList(params,sysUser);
+ }
/**
* 查询
*/
@@ -86,7 +90,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 +98,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