cs

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

@@ -1,6 +1,7 @@
 package com.zhongshu.card.client.model.org;
 
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotEmpty;
 import lombok.Data;
 
 /**
@@ -11,8 +12,10 @@ import lombok.Data;
 public class OrgUserDetailParam {
 
     @Schema(description = "用户UserId")
+    @NotEmpty
     private String userId;
 
+    @NotEmpty
     @Schema(description = "机构Oid", hidden = true)
     private String oid;
 }

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

@@ -12,6 +12,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.apache.commons.lang3.ObjectUtils;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -56,15 +57,36 @@ public class OrganizationUserModel extends SuperModel {
     @Schema(description = "用户ID")
     private String userId;
 
+    public String getUserId() {
+        if (user != null) {
+            return user.getUserId();
+        }
+        return userId;
+    }
+
     @Schema(description = "工号、编码")
     private String code;
 
     @Schema(description = "用户手机号")
     private String phone;
 
+    public String getPhone() {
+        if (user != null) {
+            return user.getPhone();
+        }
+        return phone;
+    }
+
     @Schema(description = "姓名")
     private String name;
 
+    public String getName() {
+        if (ObjectUtils.isNotEmpty(user)) {
+            return user.getName();
+        }
+        return name;
+    }
+
     @Schema(description = "真实姓名")
     private String realName;
 
@@ -72,7 +94,7 @@ public class OrganizationUserModel extends SuperModel {
         if (user != null) {
             return user.getRealName();
         }
-        return name;
+        return getName();
     }
 
     @Schema(description = "用户状态")

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

@@ -29,7 +29,7 @@ public interface UserAccountService {
      * @param userId 用户userId
      * @return
      */
-    OrganizationUserModel getOrgUserDetail(String oid, String userId);
+    OrganizationUserModel getOrgUserDetail(String oid, String userId, boolean isContentUserInfo);
 
     // 得到平台用户详情
     ResultContent<OrganizationUserModel> getOrgUserDetail(OrgUserDetailParam param);

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/orgManager/CardController.java

@@ -27,7 +27,7 @@ import java.util.List;
  * @date 2024/6/5
  */
 @RestController
-@RequestMapping("/school/card")
+@RequestMapping("/org/card")
 @Tag(name = "项目-卡片管理")
 public class CardController {
 
@@ -55,10 +55,12 @@ public class CardController {
     }
 
     @ResourceAuth(value = "user", type = AuthType.User)
-    @Operation(summary = "得到指定用户在学校的所有卡片", description = "得到指定用户在学校的所有卡片")
+    @Operation(summary = "得到指定用户在机构的所有卡片", description = "得到指定用户在学校的所有卡片")
     @RequestMapping(value = {"getUserOrgAllCard"}, method = {RequestMethod.POST})
-    public ResultContent<List<CardInfoModel>> getUserOrgAllCard(@RequestBody OrgUserDetailParam param) {
-        return schoolUserService.getUserOrgAllCard(param);
+    public ResultContent<List<CardInfoModel>> getUserOrgAllCard(
+            @RequestBody @Valid OrgUserDetailParam param) {
+        List<CardInfoModel> cardInfoModels = cardInfoService.getUserOrgAllCard(param.getUserId(), param.getOid());
+        return ResultContent.buildSuccess(cardInfoModels);
     }
 
     @ResourceAuth(value = "user", type = AuthType.User)

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/orgManager/CardInfoPoolController.java

@@ -33,7 +33,7 @@ import java.util.List;
  * @date 2024/6/5
  */
 @RestController
-@RequestMapping("/school/cardPool")
+@RequestMapping("/org/cardPool")
 @Tag(name = "项目-卡片池管理")
 public class CardInfoPoolController {
 

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/school/CardInfoServiceImpl.java

@@ -479,11 +479,12 @@ public class CardInfoServiceImpl extends SuperService implements CardInfoService
     //----------------------------园区卡片操作 start ------------------------
 
     public ResultContent<Page<CardInfoPoolModel>> page(CardInfoSearch param, Pageable pageable) {
+        checkParamOid(param);
         initOidSearchParam(param);
         String oid = param.getOid();
         OidAboutInfo aboutInfo = organizationService.getOidAboutOrgInfo(oid);
         param.setProjectOid(aboutInfo.getProjectOid());
-        param.setSchoolOid(aboutInfo.getSchoolOid());
+
         Page<CardInfo> page = cardInfoDao.page(pageable, param);
         return ResultContent.buildSuccess(PageEntityUtil.concurrent2PageModel(page, this::toOrgModel));
     }
@@ -618,9 +619,8 @@ public class CardInfoServiceImpl extends SuperService implements CardInfoService
         if (ObjectUtils.isNotEmpty(entity)) {
             model = new CardInfoModel();
             BeanUtils.copyProperties(entity, model);
-
             // 机构用户信息
-            OrganizationUserModel organizationUser = userAccountService.getOrgUserDetail(entity.getSchoolOid(), entity.getUserId());
+            OrganizationUserModel organizationUser = userAccountService.getOrgUserDetail(entity.getOid(), entity.getUserId(), true);
             model.setOrganizationUser(organizationUser);
         }
         return model;

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

@@ -312,8 +312,14 @@ public class UserAccountServiceImpl extends SuperService implements UserAccountS
         return ResultContent.buildSuccess(userAccount.getUserId());
     }
 
+    /**
+     * @param oid               机构oid
+     * @param userId            用户userId
+     * @param isContentUserInfo 在没找到用户在结构的信息时，返回组装用户的基本信息
+     * @return
+     */
     @Override
-    public OrganizationUserModel getOrgUserDetail(String oid, String userId) {
+    public OrganizationUserModel getOrgUserDetail(String oid, String userId, boolean isContentUserInfo) {
         OrgUserDetailParam param = new OrgUserDetailParam();
         param.setOid(oid);
         param.setUserId(userId);
@@ -321,6 +327,15 @@ public class UserAccountServiceImpl extends SuperService implements UserAccountS
         if (content.isSuccess()) {
             return content.getContent();
         }
+        if (isContentUserInfo && StringUtils.isNotEmpty(userId)) {
+            UserAccount userAccount = userCountDao.findTopByUserId(userId);
+            if (ObjectUtils.isEmpty(userAccount)) {
+                return null;
+            }
+            OrganizationUserModel organizationUser = new OrganizationUserModel();
+            organizationUser.setUser(toModel(userAccount));
+            return organizationUser;
+        }
         return null;
     }