更新

FullCardClient/src/main/java/com/zhongshu/card/client/service/feign/OrganizationFeignService.java

@@ -14,6 +14,13 @@ import org.springframework.web.bind.annotation.RequestParam;
 @FeignClient(name = "fullcardserver/organizationFeign/manager")
 public interface OrganizationFeignService {
 
+    @Operation(summary = "机构简单信息", description = "机构简单信息")
+    @RequestMapping(value = "getDetail", method = RequestMethod.GET)
+    ResultContent<OrganizationSimpleModel> getDetail(
+            @Parameter(name = "oid", description = "oid", required = true)
+            @RequestParam(name = "oid") String oid);
+
+
     @Operation(summary = "得到项目信息", description = "得到项目信息")
     @RequestMapping(value = "getProjectInfo", method = RequestMethod.GET)
     ResultContent<ProjectOrgModel> getProjectInfo(@Parameter(name = "projectOid", description = "oid", required = false) @RequestParam(name = "projectOid") String projectOid);

FullCardClient/src/main/java/com/zhongshu/card/client/service/org/OrganizationService.java

@@ -44,7 +44,7 @@ public interface OrganizationService {
     ResultContent updateSchool(SchoolUpdateParam param);
 
     // 查询结构详情
-    ResultContent<OrganizationModel> getDetail(String oid);
+    ResultContent<OrganizationSimpleModel> getDetail(String oid);
 
     // 得到项目的信息
     ResultContent<ProjectOrgModel> getProjectDetail(String projectOid);

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/feign/OrganizationFeignController.java

@@ -27,6 +27,14 @@ public class OrganizationFeignController {
     @Autowired
     UserAccountService userAccountService;
 
+    @Operation(summary = "机构简单信息", description = "机构简单信息")
+    @RequestMapping(value = "manager/getDetail", method = {RequestMethod.GET})
+    public ResultContent<OrganizationSimpleModel> getDetail(
+            @Parameter(name = "oid", description = "oid", required = false)
+            @RequestParam(name = "oid") String oid) {
+        return organizationService.getDetail(oid);
+    }
+
     @Operation(summary = "得到项目信息", description = "得到项目信息")
     @RequestMapping(value = "manager/getProjectInfo", method = {RequestMethod.GET})
     public ResultContent<ProjectOrgModel> getProjectInfo(

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

@@ -375,12 +375,12 @@ public class OrganizationServiceImpl extends SuperService implements Organizatio
      * @param oid
      * @return
      */
-    public ResultContent<OrganizationModel> getDetail(String oid) {
+    public ResultContent<OrganizationSimpleModel> getDetail(String oid) {
         Organization organization = organizationDao.findTopByOid(oid);
         if (ObjectUtils.isEmpty(organization)) {
             return ResultContent.buildFail(String.format(ResultMessage.DATA_NOT_EXIST, oid));
         }
-        OrganizationModel model = toModel(organization);
+        OrganizationSimpleModel model = toSimpleModel(organization);
         return ResultContent.buildSuccess(model);
     }