From cbc1f9db3d796683d88d6d30df3659984dfbeda3 Mon Sep 17 00:00:00 2001
From: webapp <webapp@home-server.attdns.com>
Date: 星期一, 30 九月 2019 22:56:12 +0800
Subject: [PATCH] 取消java110-common jar包,提升为CommonService服务,将之前的Java110-common内容变更为Java110-utils包

---
 WebService/src/main/java/com/java110/web/smo/impl/NavServiceSMOImpl.java |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/WebService/src/main/java/com/java110/web/smo/impl/NavServiceSMOImpl.java b/WebService/src/main/java/com/java110/web/smo/impl/NavServiceSMOImpl.java
index f32b160..d716b17 100644
--- a/WebService/src/main/java/com/java110/web/smo/impl/NavServiceSMOImpl.java
+++ b/WebService/src/main/java/com/java110/web/smo/impl/NavServiceSMOImpl.java
@@ -2,8 +2,9 @@
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.java110.common.constant.ServiceConstant;
-import com.java110.common.constant.StatusConstant;
+import com.java110.utils.constant.ServiceConstant;
+import com.java110.utils.constant.StateConstant;
+import com.java110.utils.util.CommonUtil;
 import com.java110.core.context.IPageData;
 import com.java110.web.core.BaseComponentSMO;
 import com.java110.web.smo.ICommunityServiceSMO;
@@ -79,6 +80,12 @@
             JSONObject tmpUserInfo = JSONObject.parseObject(responseEntity.getBody().toString());
             JSONObject resultUserInfo = new JSONObject();
             resultUserInfo.put("name", tmpUserInfo.getString("name"));
+            resultUserInfo.put("address", tmpUserInfo.getString("address"));
+            resultUserInfo.put("sex", tmpUserInfo.getString("sex"));
+            resultUserInfo.put("localtionCd", tmpUserInfo.getString("localtionCd"));
+            resultUserInfo.put("levelCd", tmpUserInfo.getString("levelCd"));
+            resultUserInfo.put("tel", CommonUtil.mobileEncrypt(tmpUserInfo.getString("tel")));
+            resultUserInfo.put("email", tmpUserInfo.getString("email"));
             responseEntity = new ResponseEntity<String>(resultUserInfo.toJSONString(), HttpStatus.OK);
         }
         return responseEntity;
@@ -102,7 +109,7 @@
         for (int communityIndex = 0; communityIndex < communitys.size(); communityIndex++) {
             tempCommunity = communitys.getJSONObject(communityIndex);
 
-            if (!StatusConstant.STATUS_CD_AUDIT_COMPLETE.equals(tempCommunity.getString("auditStatusCd"))) {
+            if (!StateConstant.AGREE_AUDIT.equals(tempCommunity.getString("auditStatusCd"))) {
                 continue;
             }
             newCommunity = new JSONObject();

--
Gitblit v1.8.0