1.修改新增学生老师接口

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

@@ -10,6 +10,7 @@ import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
 import com.microsvc.toolkit.common.webportal.exception.BizException;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
+import com.yonge.cooleshow.biz.dal.dao.EmployeeDao;
 import com.yonge.cooleshow.biz.dal.dao.StudentDao;
 import com.yonge.cooleshow.biz.dal.dao.SubjectDao;
 import com.yonge.cooleshow.biz.dal.dao.TeacherDao;
@@ -105,6 +106,9 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, Student> impleme
     @Autowired
     private TenantAlbumPurchaseMapper tenantAlbumPurchaseMapper;
 
+    @Autowired
+    private EmployeeDao employeeDao;
+
     @Override
     public StudentDao getDao() {
         return baseMapper;
@@ -509,6 +513,33 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, Student> impleme
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void addStudent(StudentWrapper.Student student) {
+        SysUser sysUser = employeeDao.querySysUserByPhone(student.getPhone());
+        if (sysUser == null) {
+            sysUser = new SysUser();
+            sysUser.setUserType(ClientEnum.STUDENT.getCode());
+            //设置默认头像
+            if (StringUtil.isEmpty(sysUser.getAvatar())) {
+                String defaultHeard = sysConfigService.findConfigValue(SysConfigConstant.DEFAULT_HEARD);
+                sysUser.setAvatar(defaultHeard);
+            }
+
+            sysUser.setUsername(student.getName());
+            sysUser.setPhone(student.getPhone());
+            //初始密码，手机号后6位
+            String password = sysUser.getPhone().substring(sysUser.getPhone().length() - 6);
+            sysUser.setPassword(new BCryptPasswordEncoder().encode(password));
+            //插入
+            employeeDao.insertSysUser(sysUser);
+        } else {
+            if (StringUtil.isEmpty(sysUser.getUserType())) {
+                sysUser.setUserType(ClientEnum.STUDENT.getCode());
+            } else if (!sysUser.getUserType().contains(ClientEnum.STUDENT.getCode())) {
+                sysUser.setUserType(sysUser.getUserType() + "," + ClientEnum.STUDENT.getCode());
+            }
+            employeeDao.updateSysUser(sysUser);
+        }
+
+        student.setId(sysUser.getId());
         Long tenantId = student.getTenantId();
         // 更新头像
         if (StringUtils.isEmpty(student.getAvatar())) {
@@ -531,7 +562,7 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, Student> impleme
             // 自动与机构老师成为好友
             List<Teacher> teacherList = teacherDao.selectList(Wrappers.<Teacher>lambdaQuery()
                     .eq(Teacher::getTenantId, tenantId));
-            if(!teacherList.isEmpty()){
+            if (!teacherList.isEmpty()) {
                 teacherList.forEach(next -> imUserFriendService.saveUserFriend(next.getUserId(),
                         new HashSet<>(ImmutableList.of(student.getId()))));
             }

cooleshow-user/user-tenant/src/main/java/com/yonge/cooleshow/tenant/controller/open/OpenStudentController.java

@@ -104,7 +104,6 @@ public class OpenStudentController extends BaseController {
         if (studentId != null) {
             Student one = studentService.lambdaQuery()
                     .eq(Student::getUserId, studentId)
-                    .eq(Student::getHideFlag, 0)
                     .last("limit 1").one();
             if (one != null) {
                 if (one.getTenantId().equals(-1L)) {