Merge remote-tracking branch 'origin/dev' into dev

zhaoxiaohao

2020-04-24 d3386ce4a4439ee740ca79d33ac7040963a18948

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

@@ -23,6 +23,7 @@

/**
 * 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
 *
 * @Description: 组织架构表
 * @Project: 用户中心
 * @CreateDate: Created in 2020-04-10 15:21:10 <br>
@@ -53,6 +54,7 @@
        }
        return ResultBody.ok().data(sysOrganizationService.findList(params));
    }

    /**
     * 列表
     */
@@ -69,12 +71,11 @@
        }
        if (params.get("orgName")!=null) {
            return ResultBody.ok().data(sysOrganizationService.findList(params).getData());
        }
        else
        {
        } else {
            return ResultBody.ok().data(null);
        }
    }

    @ApiOperation(value = "查询列表by MAP")
    @GetMapping("getListByMap")
    public ResultBody getListByMap(@RequestParam Map<String, Object> params) {
@@ -86,6 +87,7 @@
    public ResultBody getTree(@RequestParam Map<String, Object> params) {
        return sysOrganizationService.getTree(params);
    }

    @ApiOperation(value = "更新状态")
    @GetMapping("updateEnabled")
    public ResultBody updateEnabled(@RequestParam Map<String, Object> params) {
@@ -128,8 +130,7 @@
            boolean v= sysOrganizationService.saveOrUpdate(sysOrganization);
            if(v) {
                return ResultBody.ok().data(sysOrganization).msg("保存成功");
            }
            else {
            } else {
                return ResultBody.failed().msg("保存失败");
            }
        }
@@ -144,8 +145,7 @@
        boolean v= sysOrganizationService.removeById(id);
        if(v) {
            return ResultBody.ok().msg("删除成功");
        }
        else {
        } else {
            return ResultBody.failed().msg("删除失败");
        }
    }