Merge branch 'online' of http://git.dayaedu.com/yonge/cooleshow into test

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/TeacherAuthEntryRecordServiceImpl.java

@@ -28,6 +28,7 @@ import com.yonge.toolset.base.util.StringUtil;
 import com.yonge.toolset.base.util.ThreadPool;
 import com.yonge.toolset.thirdparty.message.MessageSenderPluginContext;
 import com.yonge.toolset.utils.string.ValueUtil;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
@@ -102,10 +103,8 @@ public class TeacherAuthEntryRecordServiceImpl extends ServiceImpl<TeacherAuthEn
                 continue;
             }*/
             if (authOperaReq.getPass()) {
-                if(build.getTeacherAuthType() == AuthTypeEnum.ADD){
-                    teacher.setSubjectId(build.getSubjectId());
-                    teacher.setIntroduction(build.getIntroduction());
-                }
+                teacher.setSubjectId(StringUtils.isEmpty(teacher.getSubjectId())?build.getSubjectId():teacher.getSubjectId());
+                teacher.setIntroduction(StringUtils.isEmpty(teacher.getIntroduction())?build.getIntroduction():teacher.getIntroduction());
                 teacher.setSubject(build.getSubject());
                 teacher.setGraduateSchool(build.getGraduateSchool());
                 teacher.setGradCertificate( StringUtil.isEmpty(build.getGradCertificate())?"":build.getGradCertificate());