From 519a87f05bd981ae4fcb56fb4cbe56cd119e24b0 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Mon, 20 Apr 2020 17:32:06 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev
---
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserOrgController.java | 89 ++++----------------------------------------
1 files changed, 9 insertions(+), 80 deletions(-)
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserOrgController.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserOrgController.java
index fb9520f..1a9db1d 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserOrgController.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserOrgController.java
@@ -1,97 +1,26 @@
package com.kidgrow.usercenter.controller;
-import com.kidgrow.common.controller.BaseController;
-import com.kidgrow.common.model.PageResult;
-import com.kidgrow.common.model.ResultBody;
import com.kidgrow.common.model.SysUserOrg;
+import com.kidgrow.usercenter.service.ISysOrganizationService;
import com.kidgrow.usercenter.service.ISysUserOrgService;
import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;
-import javax.validation.Valid;
+import java.util.List;
import java.util.Map;
-
-/**
- * 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
- * @Description: 用户和组织关系表
- * @Project: 用户中心
- * @CreateDate: Created in 2020-03-31 11:01:35 <br>
- * @Author: <a href="4345453@kidgrow.com">liuke</a>
- * @version: 1.0
- */
@Slf4j
@RestController
@RequestMapping("/sysuserorg")
-@Api(tags = "用户和组织关系表")
-public class SysUserOrgController extends BaseController{
+@Api(tags = "")
+public class SysUserOrgController {
@Autowired
- private ISysUserOrgService sysUserOrgService;
-
- /**
- * 列表
- */
- @ApiOperation(value = "查询列表")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "page", value = "分页起始位置", required = true, dataType = "Integer"),
- @ApiImplicitParam(name = "limit", value = "分页结束位置", required = true, dataType = "Integer")
- })
- @GetMapping
- public PageResult list(@RequestParam Map<String, Object> params) {
- if(params.size()==0){
- params.put("page",1);
- params.put("limit",10);
- }
- return sysUserOrgService.findList(params);
- }
-
- /**
- * 查询
- */
- @ApiOperation(value = "查询")
- @GetMapping("/{id}")
- public ResultBody findById(@PathVariable Long id) {
- SysUserOrg model = sysUserOrgService.getById(id);
- return ResultBody.ok().data(model).msg("查询成功");
- }
-
- /**
- * 根据SysUserOrg当做查询条件进行查询
- */
- @ApiOperation(value = "根据SysUserOrg当做查询条件进行查询")
- @PostMapping("/query")
- public ResultBody findByObject(@RequestBody SysUserOrg sysUserOrg) {
- SysUserOrg model = sysUserOrgService.findByObject(sysUserOrg);
- return ResultBody.ok().data(model).msg("查询成功");
- }
-
- /**
- * 新增or更新
- */
- @ApiOperation(value = "保存")
- @PostMapping
- public ResultBody save(@Valid @RequestBody SysUserOrg sysUserOrg, BindingResult bindingResult) {
- if (bindingResult.hasErrors()) {
- return ResultBody.failed().msg(bindingResult.getFieldError().getDefaultMessage());
- } else {
- sysUserOrgService.saveOrUpdate(sysUserOrg);
- return ResultBody.ok().data(sysUserOrg).msg("保存成功");
- }
- }
-
- /**
- * 删除
- */
- @ApiOperation(value = "删除")
- @DeleteMapping("/{id}")
- public ResultBody delete(@PathVariable Long id) {
- sysUserOrgService.removeById(id);
- return ResultBody.ok().msg("删除成功");
+ private ISysUserOrgService iSysUserOrgService;
+ @PostMapping("getListByMap")
+ public List<SysUserOrg> getListByMap(@RequestParam Map<String,Object> map){
+ List<SysUserOrg> sysUserOrgs = iSysUserOrgService.listByMap(map);
+ return sysUserOrgs;
}
}
--
Gitblit v1.8.0