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

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

@@ -12,6 +12,7 @@ import com.ssj.dao.sys.imlibuser.dao.TbClassTeacherTempDao;
 import com.ssj.framework.core.common.service.BaseServiceImpl;
 import com.ssj.framework.core.util.Constant;
 import com.ssj.framework.core.util.PasswordUtil;
+import com.ssj.framework.core.util.StringUtil;
 import com.ssj.framework.idworker.IdWorker;
 import com.ssj.service.sys.imlibuser.service.TbClassService;
 import com.ssj.service.sys.imlibuser.service.TbClassStudentService;
@@ -357,6 +358,8 @@ public class TbClassTeacherTempServiceImpl extends BaseServiceImpl<TbClassTeache
 					user.setUserName(tbLibImTeacherTemp.getTeacherName());
 					user.setMobile(tbLibImTeacherTemp.getTeacherPhone());
 					user.setCreateTime(new Date());
+				}
+				if(StringUtil.isBlank(user.getPassword())){
 					if(tbLibImTeacherTemp.getType()==30){
 						user.setPassword("123456");
 					}else{
@@ -368,6 +371,8 @@ public class TbClassTeacherTempServiceImpl extends BaseServiceImpl<TbClassTeache
 					user=userService.save(user);
 				}
 
+
+
 				//如果之前有这个老师的，就统一使用用旧老师的名称，如果没有就使用新的名称。
 				TbLibManager tbLibManager=managerService.findByUserId(user.getId());
 				if(tbLibManager==null){