获取企业信息修改

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

@@ -27,7 +27,7 @@ public interface UserspaceDao extends JpaRepository<Userspace, Long>, JpaSpecifi
      * @param spaceName 企业名称
      * @return 企业信息
      */
-    Set<Userspace> findBySpaceName(String spaceName);
+    Userspace findBySpaceName(String spaceName);
 
     /**
      * 根据企业营业执照号查找企业信息
@@ -35,7 +35,7 @@ public interface UserspaceDao extends JpaRepository<Userspace, Long>, JpaSpecifi
      * @param businessCode 企业营业执照号
      * @return
      */
-    List<Userspace> findByBusinessCode(String businessCode);
+    Userspace findByBusinessCode(String businessCode);
 
     /**
      * 找到企业最大的uu号
@@ -58,7 +58,7 @@ public interface UserspaceDao extends JpaRepository<Userspace, Long>, JpaSpecifi
      * @param validCode 认证状态
      * @return 企业信息
      */
-    List<Userspace> findBySpaceNameAndValidCode(String spaceName, Short validCode);
+    Userspace findBySpaceNameAndValidCode(String spaceName, Short validCode);
 
     /**
      * 根据企业营业执照号查询认证状态的企业
@@ -66,7 +66,7 @@ public interface UserspaceDao extends JpaRepository<Userspace, Long>, JpaSpecifi
      * @param validCode 认证状态
      * @return 企业信息
      */
-    List<Userspace> findByBusinessCodeAndValidCode(String businessCode, short validCode);
+    Userspace findByBusinessCodeAndValidCode(String businessCode, short validCode);
 
     /**
      * 根据关键词搜索相关的企业名

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

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

sso-server/src/main/java/com/uas/sso/service/UserspaceService.java

@@ -96,7 +96,7 @@ public interface UserspaceService {
      * @param spaceName 企业名称
      * @return
      */
-    Set<Userspace> findBySpaceName(String spaceName);
+    Userspace findBySpaceName(String spaceName);
 
     /**
      * 企业解除绑定应用
@@ -117,5 +117,5 @@ public interface UserspaceService {
      * @param businessCode 企业营业执照号
      * @return
      */
-    List<Userspace> findByBusinessCode(String businessCode);
+     Userspace findByBusinessCode(String businessCode);
 }

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

@@ -174,16 +174,16 @@ public class UserspaceServiceImpl implements UserspaceService {
 
     @Override
     public void checkSpaceName(String spaceName) {
-        Set<Userspace> userSpaces = userspaceDao.findBySpaceName(spaceName);
-        if (!CollectionUtils.isEmpty(userSpaces)) {
+        Userspace userSpace = userspaceDao.findBySpaceName(spaceName);
+        if (userSpace != null) {
             throw new VisibleError("该企业名称已被注册，请确认");
         }
     }
 
     @Override
     public void checkBusinessCode(String businessCode) {
-        List<Userspace> userSpaces = userspaceDao.findByBusinessCode(businessCode);
-        if (!CollectionUtils.isEmpty(userSpaces)) {
+        Userspace userSpace = userspaceDao.findByBusinessCode(businessCode);
+        if (userSpace != null) {
             throw new VisibleError("该企业营业执照已被注册，请确认");
         }
     }
@@ -195,14 +195,14 @@ public class UserspaceServiceImpl implements UserspaceService {
 
     @Override
     public boolean spaceNameIsValid(String spaceName) {
-        List<Userspace> userSpaces = userspaceDao.findBySpaceNameAndValidCode(spaceName, (short) Status.AUTHENTICATED.getCode());
-        return !CollectionUtils.isEmpty(userSpaces);
+        Userspace userSpace = userspaceDao.findBySpaceName(spaceName);
+        return userSpace == null ? false : userSpace.getValidCode() == Status.AUTHENTICATED.getCode();
     }
 
     @Override
     public boolean businessCodeIsValid(String businessCode) {
-        List<Userspace> userSpaces = userspaceDao.findByBusinessCodeAndValidCode(businessCode, (short) Status.AUTHENTICATED.getCode());
-        return !CollectionUtils.isEmpty(userSpaces);
+        Userspace userSpace = userspaceDao.findByBusinessCode(businessCode);
+        return userSpace == null ? false : userSpace.getValidCode() == Status.AUTHENTICATED.getCode();
     }
 
     @Override
@@ -235,7 +235,7 @@ public class UserspaceServiceImpl implements UserspaceService {
     }
 
     @Override
-    public Set<Userspace> findBySpaceName(String spaceName) {
+    public Userspace findBySpaceName(String spaceName) {
         return userspaceDao.findBySpaceName(spaceName);
     }
 
@@ -280,7 +280,7 @@ public class UserspaceServiceImpl implements UserspaceService {
     }
 
     @Override
-    public List<Userspace> findByBusinessCode(String businessCode) {
+    public Userspace findByBusinessCode(String businessCode) {
         return userspaceDao.findByBusinessCode(businessCode);
     }
 }