用户信息地方的同步及处理

servers/boe-server-all/src/main/java/com/xboe/TempFilterConfig.java

@@ -15,4 +15,9 @@ public class TempFilterConfig {
 	 * 课程管理热裤机构id过滤
 	 */
 	public static final boolean Manager_Course_ByOrgIds=true;
+	
+	/**
+	 * 用户登录使用api
+	 */
+	public static final boolean Login_User_ByApi=true;
 }

servers/boe-server-all/src/main/java/com/xboe/data/dto/UserData.java

@@ -19,10 +19,12 @@ public class UserData {
 	/**用户工号*/
 	private String code;
 	
+	private String mobile;
+	
 	/**band的级别*/
 	private Integer bandLevel;
 	
-	/**姓名*/
+	/**姓名,对应realName*/
 	private String name;
 	
 	/**用户的头像*/
@@ -44,12 +46,12 @@ public class UserData {
 	private String orgNamePath;
 	
 	/**
-	 * 用户类型，1表学员，2表教师，3表管理员      此在这只默认只表学员
+	 * 用户类型，1表学员   此在这只默认只表学员
 	 */
 	private Integer userType;
 
 	/**
-	 * 表教师        是为1
+	 * 表教师    是为1
 	 * */
 	private Boolean teacher;
 

servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java

@@ -111,12 +111,12 @@ public class OutSideDataServiceImpl implements IOutSideDataService {
 	        	}else {
 	        		user.setBandLevel(0);
 	        	}
-	        	user.setAvatar("");
+	        	user.setAvatar(getNodeText(result.get("avatar")));
 	        	user.setCode(getNodeText(result.get("userNo")));
 	        	//user.setDeleted(result.get("deleted").asBoolean());//无此字段
 	        	user.setDeleted(false);
 	        	user.setDepartId(getNodeText(result.get("departId")));
-	        	user.setDepartName("");//无此字段
+	        	user.setDepartName(getNodeText(result.get("departName")));//无此字段
 	        	user.setGender(1);//少此字段
 	        	user.setKid(getNodeText(result.get("kid")));
 	        	user.setLearningDuration(result.get("learningDuration").asInt());
@@ -139,6 +139,7 @@ public class OutSideDataServiceImpl implements IOutSideDataService {
 						}
 						if(roleCode.equals("teacher")){
 							user.setTeacher(true);//是老师
+							user.setUserType(2);//教师
 						}
 					}
 				}
@@ -148,8 +149,8 @@ public class OutSideDataServiceImpl implements IOutSideDataService {
 	        	}
 	            
 	        }
-	        System.out.println("用户管理员:"+user.getAdminType());
-	        System.out.println("老师:"+user.getTeacher());
+	        //System.out.println("用户管理员:"+user.getAdminType());
+	        //System.out.println("老师:"+user.getTeacher());
 	        return user;
         } catch (Exception e) {
         	log.error("获取当前用户信息错误",e);

servers/boe-server-all/src/main/java/com/xboe/data/service/impl/DataUserSyncServiceImpl.java

@@ -38,7 +38,10 @@ public class DataUserSyncServiceImpl implements IDataUserSyncService{
 	@Override
 	@Transactional
 	public void syncUserFull(UserData user) {
-		
+		//如果删除状态为空，则设置为不删除
+		if(user.getDeleted()==null) {
+			user.setDeleted(false);
+		}
 		//先查询是否存在
 		Account a=accountDao.get(user.getId());
 		User u=userDao.get(user.getId());
@@ -48,11 +51,11 @@ public class DataUserSyncServiceImpl implements IDataUserSyncService{
 			if(user.getDeleted()!=null) {
 				a.setDeleted(user.getDeleted());
 			}
-			
 		}else {
 			//新账户
 			a=new Account();
 			a.setDeleted(user.getDeleted());
+			
 			a.setSysId(user.getKid());
 			a.setLoginName(user.getCode());
 			a.setAvatar(user.getAvatar());

servers/boe-server-all/src/main/java/com/xboe/school/api/PortalConsoleApi.java

@@ -68,6 +68,10 @@ public class PortalConsoleApi extends ApiBaseController{
 	        }
 	        
 	        UserData userData = outsideDataService.getUserInfoByUserId(null);
+	        if(userData==null) {
+	        	log.error("通过api获取用用户信息错误【"+getCurrent().getAccountId()+"】对应的用户");
+	        	return error("未能获取当前用户信息");
+	        }
 	        
 	        User user = userService.get(getCurrent().getAccountId());
 	        Organization org = null;