企业注册bug修改

sso-server/src/main/java/com/uas/sso/service/impl/UserspaceServiceImpl.java

@@ -28,6 +28,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
+import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
@@ -80,24 +81,26 @@ public class UserspaceServiceImpl implements UserspaceService {
         // 设置管理员信息
         User oldUser = userService.findByMobile(admin.getMobile());
         if (oldUser == null) {
-            userService.register(admin);
+            admin = userService.register(admin);
         } else {
-            userService.save(admin);
+            admin = userService.save(admin);
         }
 
         // 给企业设置管理员
         userspace.setAdmin(admin);
+        userspace.setAdminUU(admin.getUserUU());
 
         // 将管理员设置在企业下
         List<User> users = new ArrayList<>();
         users.add(admin);
         userspace.setUsers(users);
         userspace.setValidCode((short) Status.TO_BE_CERTIFIED.getCode());
+        userspace.setRegisterDate(new Timestamp(System.currentTimeMillis()));
 
         // 注册企业
         userspace = userspaceDao.save(userspace);
 
-        // TODO 开通应用
+        // 开通应用
         syncUserSpaceInfo(userspace.toView(), "企业注册");
         return userspace;
     }
@@ -171,7 +174,7 @@ public class UserspaceServiceImpl implements UserspaceService {
     @Override
     public void checkSpaceName(String spaceName) {
         Set<Userspace> userSpaces = userspaceDao.findBySpaceName(spaceName);
-        if (CollectionUtils.isEmpty(userSpaces)) {
+        if (!CollectionUtils.isEmpty(userSpaces)) {
             throw new VisibleError("该企业名称已被注册，请确认");
         }
     }
@@ -179,7 +182,7 @@ public class UserspaceServiceImpl implements UserspaceService {
     @Override
     public void checkBusinessCode(String businessCode) {
         Set<Userspace> userSpaces = userspaceDao.findByBusinessCode(businessCode);
-        if (CollectionUtils.isEmpty(userSpaces)) {
+        if (!CollectionUtils.isEmpty(userSpaces)) {
             throw new VisibleError("该企业营业执照已被注册，请确认");
         }
     }