更新！

FullCardClient/src/main/java/com/zhongshu/card/client/model/base/SuperModel.java

@@ -1,12 +1,9 @@
 package com.zhongshu.card.client.model.base;
 
-import com.github.microservice.auth.security.type.AuthType;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.springframework.data.annotation.CreatedDate;
-import org.springframework.data.annotation.LastModifiedDate;
 
 import java.io.Serializable;
 
@@ -33,25 +30,19 @@ public class SuperModel implements Serializable {
 
     @Schema(description = "所属项目oid")
     private String projectOid;
-//
-//    @Schema(description = "数据主题的oid")
-//    private String aboutOid;
-//
-//    @Schema(description = "数据主题管理的oid机构类型")
-//    private AuthType aboutAuthType;
 
     @Schema(description = "创建时间")
     private Long createTime;
 
-    @Schema(description = "添加用户名称")
-    private String createUserName;
+//    @Schema(description = "添加用户名称")
+//    private String createUserName;
 
     @Schema(description = "最后编辑时间")
     private Long updateTime;
 
-    @Schema(description = "添加用户名称")
-    private String updateUserName;
-
-    @Schema(description = "添加用户电话", hidden = true)
-    private String updatePhone;
+//    @Schema(description = "添加用户名称")
+//    private String updateUserName;
+//
+//    @Schema(description = "添加用户电话", hidden = true)
+//    private String updatePhone;
 }

FullCardClient/src/main/java/com/zhongshu/card/client/openApi/base/PhoneParam.java

@@ -0,0 +1,17 @@
+package com.zhongshu.card.client.openApi.base;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+/**
+ *
+ * @author TRX
+ * @date 2025/3/10
+ */
+@Data
+public class PhoneParam extends ProjectCodeParam {
+
+    @Schema(description = "电话号码")
+    private String phone;
+
+}

FullCardClient/src/main/java/com/zhongshu/card/client/openApi/base/SuperAPIModel.java

@@ -25,4 +25,7 @@ public class SuperAPIModel implements Serializable {
     @Schema(description = "修改时间")
     private Long updateTime;
 
+    @Schema(description = "备注")
+    private String remark = "";
+
 }

FullCardClient/src/main/java/com/zhongshu/card/client/openApi/model/OrganizationUserOpenApiModel.java → FullCardClient/src/main/java/com/zhongshu/card/client/openApi/model/orgUser/OrganizationUserOpenApiModel.java

@@ -1,26 +1,12 @@
-package com.zhongshu.card.client.openApi.model;
+package com.zhongshu.card.client.openApi.model.orgUser;
 
 import com.github.microservice.auth.security.type.AuthType;
-import com.zhongshu.card.client.model.base.SuperModel;
-import com.zhongshu.card.client.model.org.DepartmentModel;
-import com.zhongshu.card.client.model.org.OrganizationMiniModel;
-import com.zhongshu.card.client.model.org.UserCountSimpleModel;
-import com.zhongshu.card.client.model.org.role.RoleModel;
-import com.zhongshu.card.client.model.school.DictInfoSimpleModel;
 import com.zhongshu.card.client.openApi.base.SuperAPIModel;
-import com.zhongshu.card.client.type.CertificateType;
-import com.zhongshu.card.client.type.OrganizationUserType;
 import com.zhongshu.card.client.type.Sex;
-import com.zhongshu.card.client.type.UserState;
 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;
-import java.util.stream.Collectors;
 
 /**
  * 机构用户详情

FullCardClient/src/main/java/com/zhongshu/card/client/openApi/params/OrganizationUserOpenApiSearch.java → FullCardClient/src/main/java/com/zhongshu/card/client/openApi/model/orgUser/OrganizationUserOpenApiSearch.java

@@ -1,15 +1,9 @@
-package com.zhongshu.card.client.openApi.params;
+package com.zhongshu.card.client.openApi.model.orgUser;
 
-import com.github.microservice.auth.security.type.AuthType;
-import com.zhongshu.card.client.model.base.SuperSearch;
 import com.zhongshu.card.client.openApi.base.SuperOpenAPIParam;
-import com.zhongshu.card.client.type.OrganizationUserType;
-import com.zhongshu.card.client.type.UserState;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @author TRX
  * @date 2024/5/31

FullCardClient/src/main/java/com/zhongshu/card/client/openApi/model/orgUser/OrganizationUserOpenSearch.java

@@ -0,0 +1,34 @@
+package com.zhongshu.card.client.openApi.model.orgUser;
+
+import com.zhongshu.card.client.openApi.base.ProjectCodeParam;
+import com.zhongshu.card.client.type.Sex;
+import com.zhongshu.card.client.type.UserState;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+/**
+ * @author TRX
+ * @date 2024/5/31
+ */
+@Data
+public class OrganizationUserOpenSearch extends ProjectCodeParam {
+
+    @Schema(description = "关键字")
+    private String keyWord;
+
+    @Schema(description = "工号")
+    private String code;
+
+    @Schema(description = "用户手机号")
+    private String phone;
+
+    @Schema(description = "姓名")
+    private String name;
+
+    @Schema(description = "性别")
+    private Sex sex;
+
+    @Schema(description = "用户状态")
+    private UserState state;
+
+}

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/openAPI/OrganizationUserOpenApiController.java

@@ -1,42 +0,0 @@
-package com.zhongshu.card.server.core.controller.openAPI;
-
-import com.github.microservice.net.ResultContent;
-import com.github.microservice.staticVariable.OpenApiMark;
-import com.zhongshu.card.client.model.base.IDParam;
-import com.zhongshu.card.client.openApi.model.OrganizationUserOpenApiModel;
-import com.zhongshu.card.client.openApi.params.OrganizationUserOpenApiSearch;
-import com.zhongshu.card.server.core.service.openAPI.OrganizationUserOpenApiService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * @author TRX
- * @date 2024/6/5
- */
-@RestController
-@RequestMapping("/"+ OpenApiMark.fullCardOpenAPI +"/v1/projectUserManager")
-@Tag(name = "openAPI-项目用户")
-public class OrganizationUserOpenApiController {
-
-    @Autowired
-    private OrganizationUserOpenApiService organizationUserOpenApiService;
-
-    @Operation(summary = "项目用户列表-分页查询", description = "项目用户列表-分页查询")
-    @RequestMapping(value = {"page"}, method = {RequestMethod.POST})
-    public ResultContent<Page<OrganizationUserOpenApiModel>> page(@RequestBody OrganizationUserOpenApiSearch param) {
-        return organizationUserOpenApiService.projectUserPage(param);
-    }
-
-    @Operation(summary = "用户详情", description = "用户详情")
-    @RequestMapping(value = {"getUserDetailById"}, method = {RequestMethod.POST})
-    public ResultContent<OrganizationUserOpenApiModel> getUserDetailById(@RequestBody IDParam param) {
-        return organizationUserOpenApiService.getUserDetailById(param.getId());
-    }
-
-}

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

@@ -0,0 +1,66 @@
+package com.zhongshu.card.server.core.controller.openAPI.org;
+
+import com.github.microservice.net.ResultContent;
+import com.github.microservice.staticVariable.OpenApiMark;
+import com.zhongshu.card.client.model.base.IDParam;
+import com.zhongshu.card.client.model.school.ImportResultModel;
+import com.zhongshu.card.client.openApi.base.PhoneParam;
+import com.zhongshu.card.client.openApi.base.ProjectCodeParam;
+import com.zhongshu.card.client.openApi.model.orgUser.OrganizationUserOpenApiModel;
+import com.zhongshu.card.client.openApi.model.orgUser.OrganizationUserOpenApiSearch;
+import com.zhongshu.card.server.core.service.openAPI.org.OrganizationUserOpenApiService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+
+/**
+ * @author TRX
+ * @date 2024/6/5
+ */
+@RestController
+@RequestMapping("/" + OpenApiMark.fullCardOpenAPI + "/v1/projectUserManager")
+@Tag(name = "openAPI-项目用户")
+public class OrganizationUserOpenApiController {
+
+    @Autowired
+    private OrganizationUserOpenApiService organizationUserOpenApiService;
+
+    @RequestMapping(value = "importProjectUsers", consumes = MediaType.MULTIPART_FORM_DATA_VALUE, method = RequestMethod.POST)
+    @Operation(summary = "导入项目用户", description = "导入项目用户")
+    public ResultContent<ImportResultModel> importProjectUsers(
+            HttpServletRequest request, HttpServletResponse response,
+            @RequestPart("file") MultipartFile file, ProjectCodeParam param) throws IOException {
+        if (file == null || file.isEmpty()) {
+            return ResultContent.buildFail("文件不能为空");
+        }
+        return organizationUserOpenApiService.importProjectUsers(request, response, file, param);
+    }
+
+    @Operation(summary = "项目用户列表-分页查询", description = "项目用户列表-分页查询")
+    @RequestMapping(value = {"page"}, method = {RequestMethod.POST})
+    public ResultContent<Page<OrganizationUserOpenApiModel>> page(@RequestBody OrganizationUserOpenApiSearch param) {
+        return organizationUserOpenApiService.projectUserPage(param);
+    }
+
+    @Operation(summary = "根据ID查询用户详情", description = "根据ID查询用户详情")
+    @RequestMapping(value = {"getUserDetailById"}, method = {RequestMethod.POST})
+    public ResultContent<OrganizationUserOpenApiModel> getUserDetailById(@RequestBody IDParam param) {
+        return organizationUserOpenApiService.getUserDetailById(param.getId());
+    }
+
+    @Operation(summary = "手机号码精确查询用户详情", description = "手机号码精确查询用户详情")
+    @RequestMapping(value = {"getUserDetailByPhone"}, method = {RequestMethod.POST})
+    public ResultContent<OrganizationUserOpenApiModel> getUserDetailByPhone(
+            @RequestBody PhoneParam param) {
+        return organizationUserOpenApiService.getUserDetailByPhone(param);
+    }
+
+}

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

@@ -149,7 +149,7 @@ public class OrganizationUserController {
         if (file == null || file.isEmpty()) {
             return ResultContent.buildFail("文件不能为空");
         }
-        return organizationUserService.importSchoolUsers(request, response, file, param);
+        return organizationUserService.importProjectUsers(request, response, file, param);
     }
 
     @ResourceAuth(value = "user", type = AuthType.User)

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

@@ -20,6 +20,8 @@ public interface OrganizationUserDao extends MongoDao<OrganizationUser>, Organiz
 
     OrganizationUser findTopById(String id);
 
+    OrganizationUser findTopByPhoneAndProjectOid(String phone, String projectOid);
+
     List<OrganizationUser> findByOrganizationAndIsAdmin(Organization organization, Boolean isAdmin);
 
     // 查询用户在机构的信息
@@ -31,8 +33,7 @@ public interface OrganizationUserDao extends MongoDao<OrganizationUser>, Organiz
 
     OrganizationUser findTopByUserAndProjectOidOrderByCreateTimeDesc(UserAccount user, String projectOid);
 
-    OrganizationUser findTopByOrganizationAndUserAndProjectOid(
-            Organization organization, UserAccount user, String projectOid);
+    OrganizationUser findTopByOrganizationAndUserAndProjectOid(Organization organization, UserAccount user, String projectOid);
 
     OrganizationUser findTopByOrganizationAndUserAndState(Organization organization, UserAccount user, UserState state);
 

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/base/CommonService.java

@@ -1,9 +1,15 @@
 package com.zhongshu.card.server.core.service.base;
 
+import com.github.microservice.auth.security.type.AuthType;
 import com.github.microservice.core.util.net.HttpClient;
+import com.github.microservice.net.ResultContent;
 import com.mongodb.client.result.UpdateResult;
+import com.zhongshu.card.client.type.OrganizationState;
+import com.zhongshu.card.server.core.dao.org.OrganizationDao;
+import com.zhongshu.card.server.core.domain.org.Organization;
 import com.zhongshu.card.server.core.util.CommonUtil;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.mongodb.core.MongoTemplate;
@@ -29,6 +35,24 @@ public class CommonService {
     @Autowired
     private MongoTemplate mongoTemplate;
 
+    @Autowired
+    private OrganizationDao organizationDao;
+
+    public ResultContent<String> checkProjectCanUserByCode(String projectCode) {
+        Organization projectInfo = organizationDao.findTopByCode(projectCode);
+        if (ObjectUtils.isEmpty(projectInfo)) {
+            return ResultContent.buildFail(String.format("数据存在：%s", projectCode));
+        }
+        if (projectInfo.getAuthType() != AuthType.Project) {
+            return ResultContent.buildFail(String.format("数据格式错误：%s", projectCode));
+        }
+        if (projectInfo.getState() != OrganizationState.Normal) {
+            return ResultContent.buildFail(String.format("数据不可用：%s", projectInfo.getState().getRemark()));
+        }
+        return ResultContent.buildSuccess(projectInfo.getOid());
+    }
+
+
     /**
      * 编辑数据
      *

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/base/SuperService.java

@@ -5,12 +5,12 @@ import com.github.microservice.auth.security.helper.AuthHelper;
 import com.zhongshu.card.client.model.base.SuperParam;
 import com.zhongshu.card.client.model.base.SuperSearch;
 import com.zhongshu.card.client.model.operLogs.OperationLogsAddParam;
+import com.zhongshu.card.client.utils.DateUtils;
 import com.zhongshu.card.server.core.dao.org.OrganizationDao;
 import com.zhongshu.card.server.core.dao.org.UserCountDao;
 import com.zhongshu.card.server.core.domain.base.SuperMain;
 import com.zhongshu.card.server.core.domain.org.Organization;
 import com.zhongshu.card.server.core.domain.org.UserAccount;
-import com.zhongshu.card.client.utils.DateUtils;
 import com.zhongshu.card.server.core.util.CommonUtil;
 import jakarta.servlet.http.HttpServletRequest;
 import lombok.extern.slf4j.Slf4j;
@@ -66,9 +66,13 @@ public abstract class SuperService {
      */
     public UserAccount getCurrentUserAccount() {
         UserAccount account = null;
-        String userId = getCurrentUserId();
-        if (StringUtils.isNotEmpty(userId)) {
-            account = userCountDao.findTopByUserId(userId);
+        try {
+            String userId = getCurrentUserId();
+            if (StringUtils.isNotEmpty(userId)) {
+                account = userCountDao.findTopByUserId(userId);
+            }
+        } catch (Exception e) {
+            log.error("getCurrentUserAccount error: {}", e.getMessage());
         }
         return account;
     }

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/openAPI/OrganizationUserOpenApiService.java → FullCardServer/src/main/java/com/zhongshu/card/server/core/service/openAPI/org/OrganizationUserOpenApiService.java

@@ -1,16 +1,24 @@
-package com.zhongshu.card.server.core.service.openAPI;
+package com.zhongshu.card.server.core.service.openAPI.org;
 
 import com.github.microservice.components.data.base.util.PageEntityUtil;
 import com.github.microservice.net.ResultContent;
+import com.zhongshu.card.client.model.base.ProjectOidParam;
 import com.zhongshu.card.client.model.org.orgUser.OrganizationUserSearch;
-import com.zhongshu.card.client.openApi.model.OrganizationUserOpenApiModel;
-import com.zhongshu.card.client.openApi.params.OrganizationUserOpenApiSearch;
+import com.zhongshu.card.client.model.school.ImportResultModel;
+import com.zhongshu.card.client.openApi.base.PhoneParam;
+import com.zhongshu.card.client.openApi.base.ProjectCodeParam;
+import com.zhongshu.card.client.openApi.model.orgUser.OrganizationUserOpenApiModel;
+import com.zhongshu.card.client.openApi.model.orgUser.OrganizationUserOpenApiSearch;
 import com.zhongshu.card.server.core.dao.org.OrganizationUserDao;
 import com.zhongshu.card.server.core.domain.org.Organization;
 import com.zhongshu.card.server.core.domain.org.OrganizationUser;
 import com.zhongshu.card.server.core.domain.org.UserAccount;
+import com.zhongshu.card.server.core.service.base.CommonService;
 import com.zhongshu.card.server.core.service.base.SuperService;
+import com.zhongshu.card.server.core.service.org.OrganizationUserServiceImpl;
 import com.zhongshu.card.server.core.util.BeanUtils;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -19,6 +27,7 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
 
 /**
  * 机构相关的 openAPI
@@ -33,6 +42,35 @@ public class OrganizationUserOpenApiService extends SuperService {
     @Autowired
     private OrganizationUserDao organizationUserDao;
 
+    @Autowired
+    private CommonService commonService;
+
+    @Autowired
+    private OrganizationUserServiceImpl organizationUserServiceImpl;
+
+    /**
+     *
+     * @param request
+     * @param response
+     * @param file
+     * @param param
+     * @return
+     */
+    public ResultContent<ImportResultModel> importProjectUsers(HttpServletRequest request, HttpServletResponse response, MultipartFile file, ProjectCodeParam param) {
+        if (StringUtils.isEmpty(param.getProjectCode())) {
+            return ResultContent.buildFail("projectCode不能为空");
+        }
+        String projectCode = param.getProjectCode();
+        ResultContent<String> resultContent = commonService.checkProjectCanUserByCode(projectCode);
+        if (resultContent.isFailed()) {
+            return ResultContent.buildFail(resultContent.getMsg());
+        }
+        String projectOid = resultContent.getContent();
+        ProjectOidParam oidParam = new ProjectOidParam();
+        oidParam.setProjectOid(projectOid);
+        return organizationUserServiceImpl.importProjectUsers(request, response, file, oidParam);
+    }
+
     /**
      * 项目用户列表
      *
@@ -41,13 +79,12 @@ public class OrganizationUserOpenApiService extends SuperService {
      */
     public ResultContent<Page<OrganizationUserOpenApiModel>> projectUserPage(OrganizationUserOpenApiSearch apiSearch) {
         OrganizationUserSearch param = new OrganizationUserSearch();
-        if (StringUtils.isEmpty(apiSearch.getProjectCode())) {
-            return ResultContent.buildFail("projectCode不能为空");
-        }
-        String projectOid = getOidByCode(apiSearch.getProjectCode());
-        if (StringUtils.isEmpty(projectOid)) {
-            projectOid = "unKnow";
+        String projectCode = apiSearch.getProjectCode();
+        ResultContent<String> resultContent = commonService.checkProjectCanUserByCode(projectCode);
+        if (resultContent.isFailed()) {
+            return ResultContent.buildFail(resultContent.getMsg());
         }
+        String projectOid = resultContent.getContent();
         BeanUtils.copyProperties(apiSearch, param);
         param.setProjectOid(projectOid);
 
@@ -70,6 +107,23 @@ public class OrganizationUserOpenApiService extends SuperService {
         return ResultContent.buildSuccess(toModel(organizationUser));
     }
 
+    public ResultContent<OrganizationUserOpenApiModel> getUserDetailByPhone(PhoneParam param) {
+        if (StringUtils.isNotEmpty(param.getPhone())) {
+            return ResultContent.buildFail("phone不能为空");
+        }
+        String projectCode = param.getProjectCode();
+        ResultContent<String> resultContent = commonService.checkProjectCanUserByCode(projectCode);
+        if (resultContent.isFailed()) {
+            return ResultContent.buildFail(resultContent.getMsg());
+        }
+        String projectOid = resultContent.getContent();
+        OrganizationUser organizationUser = organizationUserDao.findTopByPhoneAndProjectOid(param.getPhone(), projectOid);
+        if (ObjectUtils.isEmpty(organizationUser)) {
+            return ResultContent.buildFail("用户存在");
+        }
+        return ResultContent.buildSuccess(toModel(organizationUser));
+    }
+
     public OrganizationUserOpenApiModel toModel(OrganizationUser entity) {
         OrganizationUserOpenApiModel model = new OrganizationUserOpenApiModel();
         if (ObjectUtils.isNotEmpty(entity.getId())) {

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

@@ -823,7 +823,7 @@ public class OrganizationUserServiceImpl extends SuperService {
      * @param file
      * @return
      */
-    public ResultContent<ImportResultModel> importSchoolUsers(HttpServletRequest request, HttpServletResponse response, MultipartFile file, ProjectOidParam proParam) {
+    public ResultContent<ImportResultModel> importProjectUsers(HttpServletRequest request, HttpServletResponse response, MultipartFile file, ProjectOidParam proParam) {
         String projectOid = proParam.getProjectOid();
         Assert.hasText(projectOid, "projectOid不能为空");