update

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/StudentServiceImpl.java

@@ -10,10 +10,12 @@ import com.keao.edu.im.api.client.ImFeignService;
 import com.keao.edu.im.api.entity.ImResult;
 import com.keao.edu.im.api.entity.ImUserModel;
 import com.keao.edu.user.api.entity.Student;
+import com.keao.edu.user.dao.EmployeeDao;
 import com.keao.edu.user.dao.StudentDao;
 import com.keao.edu.user.dao.StudentExamResultDao;
 import com.keao.edu.user.dao.SysUserDao;
 import com.keao.edu.user.dto.StudentExamPaymentDto;
+import com.keao.edu.user.entity.Employee;
 import com.keao.edu.user.page.StudentApplyQueryInfo;
 import com.keao.edu.user.service.StudentService;
 import com.keao.edu.util.collection.MapUtil;
@@ -40,6 +42,8 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
     @Autowired
     private SysUserDao sysUserDao;
     @Autowired
+    private EmployeeDao employeeDao;
+    @Autowired
     private StudentExamResultDao studentExamResultDao;
     @Autowired
     private ImFeignService imFeignService;
@@ -58,6 +62,10 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
         }
         SysUser user = sysUserDao.queryByPhone(sysUser.getPhone());
         if (user != null && user.getId() != null) {
+            Employee employee = employeeDao.get(user.getId());
+            if(employee != null && employee.getDelFlag() == false && employee.getEmployeeType().equals("ORGAN")){
+                throw new BizException("手机号被占用");
+            }
             Student stu = studentDao.get(user.getId());
             if (stu == null) {
                 student.setUserId(user.getId());
@@ -71,9 +79,6 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
             }
             return;
         }
-//        Organization organization = organizationService.get(student.getOrganId());
-//        student.setTenantId(organization.getTenantId());
-//        sysUser.setTenantId(organization.getTenantId());
         sysUser.setUserType("STUDENT");
         sysUserDao.insert(sysUser);
         ImResult imResult = imFeignService.register(new ImUserModel(sysUser.getId().toString(), sysUser.getRealName(), null));