From 9ab21680926a8e9938fe6195513bc166ad87044f Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Thu, 23 Apr 2020 15:48:53 +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/SysOrganizationController.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysOrganizationController.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysOrganizationController.java
index 243af8e..d0d2124 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysOrganizationController.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysOrganizationController.java
@@ -67,7 +67,13 @@
params.put("page",1);
params.put("limit",10);
}
- return ResultBody.ok().data(sysOrganizationService.findList(params).getData());
+ if (params.get("orgName")!=null) {
+ return ResultBody.ok().data(sysOrganizationService.findList(params).getData());
+ }
+ else
+ {
+ return ResultBody.ok().data(null);
+ }
}
@ApiOperation(value = "查询列表by MAP")
@GetMapping("getListByMap")
@@ -119,7 +125,7 @@
}
return ResultBody.failed().msg(errMsg.toString());
} else {
- boolean v= sysOrganizationService.saveOrUpdateSer(sysOrganization);
+ boolean v= sysOrganizationService.saveOrUpdate(sysOrganization);
if(v) {
return ResultBody.ok().data(sysOrganization).msg("保存成功");
}
--
Gitblit v1.8.0