Merge branch 'master' of http://47.112.200.206:3000/shenhao/sys

src/main/java/com/ssj/service/sys/imlibuser/service/impl/TbClassTeacherTempServiceImpl.java

@@ -379,7 +379,7 @@ public class TbClassTeacherTempServiceImpl extends BaseServiceImpl<TbClassTeache
 					tbLibManager=new TbLibManager();
 					tbLibManager.settPhoto(user.getPhoto());
 					tbLibManager.setUserId(user.getId());
-					tbLibManager.setType(tbLibImTeacherTemp.getType());
+					tbLibManager.setType(tbLibImTeacherTemp.getType()==null?Constant.ALL_TEACHER_TYPE:tbLibImTeacherTemp.getType());
 					tbLibManager.setCreateTime(new Date());
 					tbLibManager.setName(tbLibImTeacherTemp.getTeacherName());
 					tbLibManager.setTelephone(tbLibImTeacherTemp.getTeacherPhone());