From d6dd85576063177ed99c50f26e77987b751212ca Mon Sep 17 00:00:00 2001
From: landong2015 <hanshaofeng@lymsh.com>
Date: Tue, 3 May 2016 11:56:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mainData/src/main/resources/mainOrm/MedKids.xml              |  4 ++--
 .../com/lyms/yimiao/web/controller/v1/KidsController.java    | 12 ++++++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/mainData/src/main/resources/mainOrm/MedKids.xml b/mainData/src/main/resources/mainOrm/MedKids.xml
index 16374a2..bba80ee 100644
--- a/mainData/src/main/resources/mainOrm/MedKids.xml
+++ b/mainData/src/main/resources/mainOrm/MedKids.xml
@@ -67,8 +67,8 @@ and ki_currentOrganizationid = #{currentOrganizationId,jdbcType=VARCHAR}
  <if test="buildTime != null and buildTime != ''">
   and ki_buildtime = #{buildTime,jdbcType=VARCHAR}
  </if>
- <if test="isdelete != null and isdelete != ''">
-  and isdelete = #{isdelete,jdbcType=VARCHAR}
+ <if test="isDelete != null and isDelete != ''">
+  and isdelete = #{isDelete,jdbcType=VARCHAR}
  </if>
 </where>
 </sql>
diff --git a/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/KidsController.java b/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/KidsController.java
index c386a3f..7d1cbfe 100644
--- a/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/KidsController.java
+++ b/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/KidsController.java
@@ -11,6 +11,7 @@ import com.lymsh.yimiao.main.data.enumdata.YnEnum;
 import com.lymsh.yimiao.main.data.model.*;
 import com.lymsh.yimiao.main.data.service.*;
 import com.lymsh.yimiao.main.data.util.JsonUtil;
+import com.lymsh.yimiao.main.data.util.LoginContext;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -20,6 +21,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.*;
 
@@ -164,11 +166,17 @@ public class KidsController extends BaseController{
     @RequestMapping(value = "/babys", method = RequestMethod.POST)
     @TokenRequired
     public void UserRelateKids(HttpServletResponse response,
+                               HttpServletRequest request,
                                @RequestParam("id")String id){
 
+        MedKids kids = medKidsService.getMedKids(id);
+        if (kids == null) {
+            ResultUtils.buildParameterErrorResultAndWrite(response, "宝宝id不存在");
+            return;
+        }
         //取到当前登陆用户的id
-        MommyBobyContext mommyBobyContext= ContextHolder.getContext();
-        YmUsers users = usersService.getYmUsers(mommyBobyContext.getUserId());
+        LoginContext loginContext = (LoginContext) request.getAttribute("loginContext");
+        YmUsers users = usersService.getYmUsers(loginContext.getId());
         //把查询到的宝宝id与登陆用户关联
         YmUserKidMapsQuery query = new YmUserKidMapsQuery();
         query.setUserId(users.getId());
-- 
1.8.3.1