企业名称和营业执照号校验修改

sso-server/src/main/java/com/uas/sso/dao/UserspaceDao.java

@@ -5,6 +5,8 @@ import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Query;
 
+import java.util.List;
+
 /**
  * 企业信息dao，Userspace实体中spaceUU为主键
  *
@@ -43,4 +45,20 @@ public interface UserspaceDao extends JpaRepository<Userspace, Long>, JpaSpecifi
      * @return
      */
     Userspace findByDomain(String domain);
+
+    /**
+     * 根据企业名查询认证状态的企业
+     * @param spaceName 企业名
+     * @param validCode 认证状态
+     * @return 企业信息
+     */
+    List<Userspace> findBySpaceNameAndValidCode(String spaceName, Short validCode);
+
+    /**
+     * 根据企业营业执照号查询认证状态的企业
+     * @param businessCode 企业营业执照号
+     * @param validCode 认证状态
+     * @return 企业信息
+     */
+    List<Userspace> findByBusinessCodeAndValidCode(String businessCode, short validCode);
 }

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

@@ -33,7 +33,7 @@ public class Userspace implements Serializable {
     /**
      * 企业名称
      */
-    @Column(name = "space_name", unique = true, nullable = false)
+    @Column(name = "space_name", nullable = false)
     private String spaceName;
 
     /**

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

@@ -22,6 +22,7 @@ import com.uas.sso.util.ExecuteUtils;
 import com.uas.sso.util.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
 import java.util.ArrayList;
@@ -186,21 +187,14 @@ public class UserspaceServiceImpl implements UserspaceService {
 
     @Override
     public boolean spaceNameIsValid(String spaceName) {
-        Userspace userspace = userspaceDao.findBySpaceName(spaceName);
-        if (userspace == null) {
-            return false;
-    }
-        return userspace.getValidCode() == Status.AUTHENTICATED.getCode();
+        List<Userspace> userSpaces = userspaceDao.findBySpaceNameAndValidCode(spaceName, (short) Status.AUTHENTICATED.getCode());
+        return !CollectionUtils.isEmpty(userSpaces);
     }
 
     @Override
     public boolean businessCodeIsValid(String businessCode) {
-        Userspace userspace = userspaceDao.findByBusinessCode(businessCode);
-        // 营业执照不是注册必填项
-        if (userspace != null && userspace.getValidCode() == Status.AUTHENTICATED.getCode()) {
-            return true;
-        }
-        return false;
+        List<Userspace> userSpaces = userspaceDao.findByBusinessCodeAndValidCode(businessCode, (short) Status.AUTHENTICATED.getCode());
+        return !CollectionUtils.isEmpty(userSpaces);
     }
 
     @Override