From eab02ab1453dc1f1e9933077dde1cef67d798936 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Fri, 10 Apr 2020 11:10:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysAreaController.java | 2 +-
1 files changed, 1 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..7a5e36c 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
@@ -80,7 +80,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