From 6fd4bdff55620c562e0a22eee3c95924951b04a4 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Thu, 24 Sep 2020 14:10:28 +0800
Subject: [PATCH] Merge branch 'pay_master' of ssh://192.168.2.240:29418/kidgrow-microservices-platform into pay_master
---
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysAreaController.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysAreaController.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysAreaController.java
index f6f01c0..69ae1b9 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysAreaController.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysAreaController.java
@@ -45,6 +45,11 @@
public PageResult<SysArea> findAlls(@RequestParam Map<String, Object> params) {
return sysAreaService.findList(params);
}
+ @ApiOperation(value = "查询列表")
+ @GetMapping("/getListByMap")
+ public ResultBody getListByMap(@RequestParam Map<String, Object> params) {
+ return sysAreaService.getListByMap(params);
+ }
/**
* 查询
@@ -80,7 +85,7 @@
return ResultBody.failed().msg(errMsg.toString());
} else {
//如果父级id是空的，默认填-1
- if (sysArea.getAreaParentId().toString()=="") {
+ if (sysArea.getAreaParentId()==null) {
sysArea.setAreaParentId(-1L);
}
//添加的时候得判断主键唯一
--
Gitblit v1.8.0