From c45ba41f54c6424a20198617ff4df7433bf9e9a9 Mon Sep 17 00:00:00 2001 From: houruijun <411269194@kidgrow.com> Date: Fri, 07 Aug 2020 18:39:59 +0800 Subject: [PATCH] 1.走查运营后台后,修改了页面所有显著错误和问题 2.修改运营后台 医院,充值,产品,套餐部分业务错误 3.增加首页数据接口 --- kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/SysProductController.java | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 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 16185a5..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 @@ -1,8 +1,11 @@ package com.kidgrow.oprationcenter.controller; +import com.kidgrow.common.annotation.LoginUser; 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; import com.kidgrow.oprationcenter.service.IProductOrderDetailService; @@ -51,12 +54,12 @@ @ApiImplicitParam(name = "limit", value = "分页结束位置", required = true, dataType = "Integer") }) @GetMapping - public PageResult list(@RequestParam Map<String, Object> params) { + public PageResult list(@RequestParam Map<String, Object> params, @LoginUser SysUser sysUser) { if(params.size()==0){ params.put("page",1); params.put("limit",10); } - return sysProductService.findList(params); + return sysProductService.findList(params,sysUser); } /** @@ -84,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()) { @@ -92,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