更新

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

@@ -0,0 +1,19 @@
+package com.zhongshu.card.client.model.org;
+
+import com.zhongshu.card.client.utils.type.UserState;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+/**
+ * @author TRX
+ * @date 2024/6/6
+ */
+@Data
+public class OrgUserDetailParam {
+
+    @Schema(description = "用户UserId")
+    private String userId;
+
+    @Schema(description = "机构ID")
+    private String oid;
+}

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

@@ -20,6 +20,9 @@ public interface UserAccountService {
     @RequestMapping(value = "update", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE)
     ResultContent update(@RequestBody UserCountAddParam param);
 
+    // 得到平台用户详情
+    ResultContent<OrganizationUserModel> getOrgUserDetail(OrgUserDetailParam param);
+
     // 删除机构用户
     ResultContent deleteOrgUser(DelUserCountParam param);
 

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/org/UserController.java

@@ -63,6 +63,13 @@ public class UserController {
         return userAccountService.update(param);
     }
 
+    @ResourceAuth(value = "user", type = AuthType.User)
+    @Operation(summary = "平台用户详情", description = "平台用户详情")
+    @RequestMapping(value = {"getOrgUserDetail"}, method = {RequestMethod.POST})
+    public ResultContent getOrgUserDetail(@RequestBody OrgUserDetailParam param) {
+        return userAccountService.getOrgUserDetail(param);
+    }
+
     @ResourceAuth(value = "user", type = AuthType.User)
     @Operation(summary = "删除机构用户", description = "删除机构用户")
     @RequestMapping(value = {"deleteOrgUser"}, method = {RequestMethod.POST})

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

@@ -187,6 +187,27 @@ public class UserAccountServiceImpl extends SuperService implements UserAccountS
         return ResultContent.buildSuccess();
     }
 
+    public ResultContent<OrganizationUserModel> getOrgUserDetail(OrgUserDetailParam param) {
+        String userId = param.getUserId();
+        String oid = param.getOid();
+        if (StringUtils.isEmpty(oid)) {
+            oid = getCurrentOid();
+        }
+        Assert.hasText(oid, "oid不能为空");
+        Assert.hasText(userId, "userId不能为空");
+
+        Organization organization = organizationDao.findTopByOid(oid);
+        if (ObjectUtils.isEmpty(organization)) {
+            return ResultContent.buildFail(String.format(ResultMessage.DATA_NOT_EXIST, oid));
+        }
+        UserAccount temp = userCountDao.findTopByUserId(userId);
+        if (ObjectUtils.isEmpty(temp)) {
+            return ResultContent.buildFail(String.format(ResultMessage.DATA_NOT_EXIST, userId));
+        }
+        OrganizationUser organizationUser = organizationUserDao.findTopByOrganizationAndUser(organization, temp);
+        OrganizationUserModel model = toOrgUserModel(organizationUser);
+        return ResultContent.buildSuccess(model);
+    }
 
     /**
      * 删除机构用户