Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-pla...

zhaoxiaohao

2020-06-19 04c359a40d51c391fdfea626e7f147422a33b89f

 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysHospitalController.java

@@ -1,10 +1,12 @@
package com.kidgrow.usercenter.controller;

import com.kidgrow.common.annotation.LoginUser;
import com.kidgrow.common.constant.DictionariesConstants;
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.SysHospital;
import com.kidgrow.usercenter.service.ISysDepartmentService;
import com.kidgrow.usercenter.service.ISysHospitalService;
@@ -73,12 +75,12 @@
            @ApiImplicitParam(name = "limit", value = "分页结束位置", required = true, dataType = "Integer")
    })
    @GetMapping
    public PageResult<HospitalListVo> list(@RequestParam Map<String, Object> params) {
    public PageResult<HospitalListVo> list(@RequestParam Map<String, Object> params, @LoginUser SysUser user) {
        if (params.size() == 0) {
            params.put("page", 1);
            params.put("limit", 10);
        }
        return sysHospitalService.findHospitalList(params);
        return sysHospitalService.findHospitalList(params,user);
    }

    @PostMapping("findAll")
@@ -127,13 +129,21 @@
        SysHospital model = sysHospitalService.findByObject(sysHospital);
        return ResultBody.ok().data(model).msg("查询成功");
    }

    /**
     * 修改医院logo
     */
    @ApiOperation(value = "保存")
    @GetMapping("/updateLogo")
    public ResultBody updateLogo(@RequestBody Map<String, Object> params)
    {
        return sysHospitalService.updateLogo(params);
    }
    /**
     * 新增or更新
     */
    @ApiOperation(value = "保存")
    @PostMapping
    public ResultBody save(@Valid @RequestBody SysHospital sysHospital, BindingResult bindingResult) {
    public ResultBody save(@Valid @RequestBody SysHospital sysHospital, BindingResult bindingResult, @LoginUser SysUser sysUser) {
        List<String> errMsg = new ArrayList<>();
        if (bindingResult.hasErrors()) {
            for (ObjectError error : bindingResult.getAllErrors()) {
@@ -165,6 +175,10 @@
            }
            boolean org=organizationService.saveOrUpdate(sysOrganization);
            sysHospital.setOrgId(sysOrganization.getId());
            List<SysOrganization> organizations = sysUser.getOrganizations();
            if (organizations.size()>0) {
                sysHospital.setCreateUserOrgCode(organizations.get(organizations.size()-1).getOrgCode());
            }
            boolean v = sysHospitalService.saveOrUpdate(sysHospital);
            if (v) {
                return ResultBody.ok().data(sysHospital).msg("保存成功");