From 6557baac627dce769c2b05ab482e4daf262a88ac Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Wed, 17 Jun 2020 17:34:01 +0800
Subject: [PATCH] 1.增加工具类 MultipartFileUtils ,支持将MultipartFile类型转换为file类型 2.增加缩略图相关全局配置变量：宽高和生成缩略图的暂存目录（缩略图上传成功后会删除） 3.修改文件上传中心的上传代码，将生成目录和aliyun上传方法抽离独立 4.增加医院logo上传支持接口（可返回缩略图地址） 5.修改登录后回去用户信息不完整bug
---
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysCompanyController.java | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysCompanyController.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysCompanyController.java
index 343efba..d468069 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysCompanyController.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysCompanyController.java
@@ -1,8 +1,11 @@
package com.kidgrow.usercenter.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.usercenter.model.SysCompany;
import com.kidgrow.usercenter.service.ISysCompanyService;
import io.swagger.annotations.Api;
@@ -46,12 +49,12 @@
@ApiImplicitParam(name = "limit", value = "分页结束位置", required = true, dataType = "Integer")
})
@GetMapping
- public ResultBody<PageResult> list(@RequestParam Map<String, Object> params) {
+ public PageResult list(@RequestParam Map<String, Object> params, @LoginUser SysUser user) {
if(params.size()==0){
params.put("page",1);
params.put("limit",10);
}
- return ResultBody.ok().data(sysCompanyService.findList(params));
+ return sysCompanyService.findList(params,user);
}
/**
@@ -79,7 +82,7 @@
*/
@ApiOperation(value = "保存")
@PostMapping
- public ResultBody save(@Valid @RequestBody SysCompany sysCompany, BindingResult bindingResult) {
+ public ResultBody save(@Valid @RequestBody SysCompany sysCompany, BindingResult bindingResult, @LoginUser SysUser user) {
List<String> errMsg= new ArrayList<>();
if (bindingResult.hasErrors()) {
for (ObjectError error : bindingResult.getAllErrors()) {
@@ -87,6 +90,10 @@
}
return ResultBody.failed().msg(errMsg.toString());
} else {
+ List<SysOrganization> organizations = user.getOrganizations();
+ if (organizations.size()>0) {
+ sysCompany.setCreateUserOrgCode(organizations.get(organizations.size()-1).getOrgCode());
+ }
boolean v= sysCompanyService.saveOrUpdate(sysCompany);
if(v) {
return ResultBody.ok().data(sysCompany).msg("保存成功");
@@ -111,4 +118,12 @@
return ResultBody.failed().msg("删除失败");
}
}
+ /**
+ *修改状态
+ */
+ @ApiOperation(value = "修改状态")
+ @GetMapping("updateEnabled")
+ public ResultBody updateEnabled(@RequestParam Map<String, Object> params) {
+ return sysCompanyService.updateEnabled(params);
+ }
}
--
Gitblit v1.8.0