更新

FullCardClient/src/main/java/com/zhongshu/card/client/model/org/OrganizationAddParam.java

@@ -36,7 +36,7 @@ public class OrganizationAddParam extends SuperParam {
     @Schema(description = "地址")
     private String address;
 
-    @Schema(description = " 行政区划编码")
+    @Schema(description = " 行政区划编码,01,02,03")
     private String adminDivisionItemCode;
 
     @Schema(description = "经度")

FullCardServer/src/main/java/com/zhongshu/card/server/core/dao/org/OrganizationRelationDao.java

@@ -0,0 +1,23 @@
+package com.zhongshu.card.server.core.dao.org;
+
+import com.github.microservice.components.data.mongo.mongo.dao.MongoDao;
+import com.zhongshu.card.server.core.domain.org.Department;
+import com.zhongshu.card.server.core.domain.org.Organization;
+import com.zhongshu.card.server.core.domain.org.OrganizationRelation;
+
+import java.util.List;
+
+/**
+ * @author TRX
+ * @date 2024/3/21
+ */
+public interface OrganizationRelationDao extends MongoDao<OrganizationRelation> {
+
+    OrganizationRelation findTopById(String id);
+
+    void deleteByMainOrganization(Organization mainOrganization);
+
+    List<OrganizationRelation> findByMainOrganization(Organization mainOrganization);
+
+    OrganizationRelation findTopByMainOrganization(Organization mainOrganization);
+}

FullCardServer/src/main/java/com/zhongshu/card/server/core/dao/org/RegionDao.java

@@ -9,4 +9,8 @@ import java.util.List;
 public interface RegionDao extends MongoDao<Region>, RegionDaoExtend {
 
     List<Region> findByCodeStartingWithAndType(String code, String type);
+
+    List<Region> findByCodeIn(List<String> codes);
+
+    Region findByCode(String code);
 }

FullCardServer/src/main/java/com/zhongshu/card/server/core/domain/org/OrganizationRelation.java

@@ -0,0 +1,29 @@
+package com.zhongshu.card.server.core.domain.org;
+
+import com.zhongshu.card.server.core.domain.base.SuperMain;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.data.mongodb.core.mapping.DBRef;
+import org.springframework.data.mongodb.core.mapping.Document;
+
+/**
+ * 机构关系
+ * @author TRX
+ * @date 2024/6/4
+ */
+@Data
+@Document
+@AllArgsConstructor
+@NoArgsConstructor
+public class OrganizationRelation extends SuperMain {
+
+    @Schema(description = "主数据")
+    @DBRef(lazy = true)
+    private Organization mainOrganization;
+
+    @Schema(description = "关联数据")
+    @DBRef(lazy = true)
+    private Organization relOrganization;
+}

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/org/OrganizationServiceImpl.java

@@ -18,10 +18,7 @@ import com.zhongshu.card.client.ret.ResultContent;
 import com.zhongshu.card.client.ret.ResultMessage;
 import com.zhongshu.card.client.service.org.OrganizationService;
 import com.zhongshu.card.client.utils.type.UserState;
-import com.zhongshu.card.server.core.dao.org.OrganizationDao;
-import com.zhongshu.card.server.core.dao.org.OrganizationUserDao;
-import com.zhongshu.card.server.core.dao.org.RoleDao;
-import com.zhongshu.card.server.core.dao.org.UserCountDao;
+import com.zhongshu.card.server.core.dao.org.*;
 import com.zhongshu.card.server.core.dataConfig.CardDefault;
 import com.zhongshu.card.server.core.domain.org.Organization;
 import com.zhongshu.card.server.core.domain.org.OrganizationUser;
@@ -89,6 +86,11 @@ public class OrganizationServiceImpl extends SuperService implements Organizatio
     @Autowired
     AuthHelper authHelper;
 
+    @Autowired
+    RegionDao regionDao;
+
+    @Autowired
+    OrganizationRelationDao organizationRelationDao;
 
     /**
      * 添加机构