diff --git a/servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java
index d051e1fd..cb7d91e6 100644
--- a/servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java
@@ -33,7 +33,12 @@ public class OutSideDataServiceImpl implements IOutSideDataService {
    
     private String getNodeText(JsonNode jn) {
         if(jn!=null) {
-            return jn.requireNonNull().asText();
+            String str = jn.asText();
+            if("null".equals(str)) {
+            	return "";
+            }else {
+            	return str;
+            }
         }else {
             return "";
         }
diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/api/PortalConsoleApi.java b/servers/boe-server-all/src/main/java/com/xboe/school/api/PortalConsoleApi.java
index 6b745a70..6c5b4e08 100644
--- a/servers/boe-server-all/src/main/java/com/xboe/school/api/PortalConsoleApi.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/school/api/PortalConsoleApi.java
@@ -12,7 +12,6 @@ import org.springframework.web.bind.annotation.RestController;
 
 import com.xboe.account.entity.Account;
 import com.xboe.account.service.IAccountService;
-import com.xboe.common.utils.StringUtil;
 import com.xboe.core.CurrentUser;
 import com.xboe.core.JsonResponse;
 import com.xboe.core.api.ApiBaseController;
@@ -20,7 +19,6 @@ import com.xboe.core.api.TokenProxy;
 import com.xboe.data.dto.UserData;
 import com.xboe.data.outside.IOutSideDataService;
 import com.xboe.module.teacher.service.ITeacherService;
-import com.xboe.system.organization.entity.Organization;
 import com.xboe.system.organization.service.IOrganizationService;
 import com.xboe.system.user.entity.User;
 import com.xboe.system.user.service.IUserService;
@@ -74,7 +72,7 @@ public class PortalConsoleApi extends ApiBaseController{
 	        
 	        User user = userService.get(getCurrent().getAccountId());
 	       
-	        String departName = "";
+	        String departName = userData.getDepartName();
 	        String departFullName = userData.getOrgNamePath();
 	        
 //	        Organization org = null;
@@ -129,9 +127,12 @@ public class PortalConsoleApi extends ApiBaseController{
 	        map.put("adminType",userData==null? 0:userData.getAdminType());//管理员类型，1表默认管理员，2表非默认管理员，0表不是管理员
 	        //map.put("adminType",2);
 	        map.put("companyId",user.getCompanyId());
-	        map.put("name",user.getName());
-	        map.put("sex",user.getGender());
-	        map.put("userNo",user.getUserNo());
+//	        map.put("name",user.getName());
+//	        map.put("sex",user.getGender());
+//	        map.put("userNo",user.getUserNo());
+	        map.put("name",userData.getName());
+	        map.put("sex",userData.getGender());
+	        map.put("userNo",userData.getCode());
 	        map.put("showHome",user.getShowHome()==null? true:user.getShowHome());
 	        if(isLocalDevelopment()) {
 	        	map.put("userType",5);
@@ -139,7 +140,7 @@ public class PortalConsoleApi extends ApiBaseController{
 	        	map.put("userType",utype);
 	        }
 	        
-	        map.put("departId",user.getDepartId());
+	        map.put("departId",userData.getDepartId());
 	        map.put("sign",user.getSign());
 	        map.put("departName",departName);
 	        map.put("departFullName",departFullName);