Merge branch 'saas' of http://git.dayaedu.com/yonge/mec into saas

mec-biz/src/main/java/com/ym/mec/biz/service/impl/EmployeeServiceImpl.java

@@ -90,7 +90,7 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee>  imp
 	@Transactional(rollbackFor = Exception.class)
 	public void add(Employee employee){
 		SysUser user = teacherDao.getUserWithPhone(employee.getPhone());
-		Integer tenantId = TenantContextHolder.getTenantId();
+		Integer tenantId = employee.getTenantId();
 		if(user != null && user.getId() != null){
 			checkTenantId(tenantId,user.getTenantId());
 			Employee employee1 = employeeDao.get(user.getId());

mec-biz/src/main/java/com/ym/mec/biz/service/impl/TenantInfoServiceImpl.java

@@ -639,13 +639,22 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
                 .map(TenantInfoDto::getPhone)
                 .map(sysUserFeignService::queryUserByMobile)
                 .orElse(null);
+        TenantInfo phone = this.getOne(new WrapperUtil<TenantInfo>().queryWrapper()
+                .eq("phone_", dto.getPhone()));
+        if (Objects.nonNull(phone)) {
+            throwPhoneBizEx(bucket);
+        }
         if (Objects.nonNull(sysUser)) {
-            bucket.delete();
-            throw new BizException("该手机号已被注册!");
+            throwPhoneBizEx(bucket);
         }
         return bucket;
     }
 
+    private void throwPhoneBizEx(RBucket<Object> bucket) {
+        bucket.delete();
+        throw new BizException("该手机号已被注册!");
+    }
+
     /**
      * set机构Id 并执行一个操作
      *