企业没有营业执照号，注册日期同步报错问题

sso-manage-console/src/main/java/com/uas/sso/sso/backend/service/impl/UserSpaceServiceImpl.java

@@ -136,7 +136,7 @@ public class UserSpaceServiceImpl implements UserSpaceService {
             }
         }
 
-        if (!spaceInfo.getBusinessCode().equals(userspace.getBusinessCode())) {
+        if (spaceInfo.getBusinessCode() != null && !spaceInfo.getBusinessCode().equals(userspace.getBusinessCode())) {
             Userspace oldSpace = userspaceDao.findByBusinessCode(spaceInfo.getBusinessCode());
             if (oldSpace != null) {
                 throw new ValidationFailedException(String.format("企业营业执照号'%s'已被注册，请确认 ", spaceInfo.getBusinessCode()));

sso-server/src/main/java/com/uas/sso/entity/Userspace.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.annotation.JSONField;
 import java.io.Serializable;
 import java.sql.Timestamp;
 import java.util.List;
+import java.util.Optional;
 import javax.persistence.*;
 
 import com.uas.sso.core.Const;
@@ -280,7 +281,7 @@ public class Userspace implements Serializable {
     }
 
     public String getSpaceName() {
-        if (spaceName.contains(Const.REPEAT_SEPARATOR)) {
+        if (spaceName != null && spaceName.contains(Const.REPEAT_SEPARATOR)) {
             return spaceName.substring(0, spaceName.indexOf(Const.REPEAT_SEPARATOR));
         }
         return spaceName;
@@ -331,7 +332,7 @@ public class Userspace implements Serializable {
     }
 
     public String getBusinessCode() {
-        if (businessCode.contains(Const.REPEAT_SEPARATOR)) {
+        if (businessCode != null && businessCode.contains(Const.REPEAT_SEPARATOR)) {
             return businessCode.substring(0, businessCode.indexOf(Const.REPEAT_SEPARATOR));
         }
         return businessCode;
@@ -588,7 +589,7 @@ public class Userspace implements Serializable {
         userSpaceView.setSpaceUU(this.getSpaceUU());
         userSpaceView.setSpaceName(this.getSpaceName());
         userSpaceView.setCorporation(this.getCorporation());
-        userSpaceView.setRegisterDate(this.getRegisterDate().getTime());
+        userSpaceView.setRegisterDate(Optional.ofNullable(registerDate).map(Timestamp::getTime).orElse(null));
         userSpaceView.setAdmin(this.getAdmin().toView());
         userSpaceView.setAdminUU(this.getAdminUU());
         userSpaceView.setBusinessCode(this.getBusinessCode());