From e771eb66f44e4b40b279eb78b774dd6846effd94 Mon Sep 17 00:00:00 2001 From: zhaokai Date: Tue, 20 Jan 2026 14:33:49 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9Eapp=E6=A0=B9=E6=8D=AE?= =?UTF-8?q?=E6=89=8B=E6=9C=BA=E5=8F=B7=E6=9F=A5=E8=AF=A2=E5=9C=A8=E8=81=8C?= =?UTF-8?q?=E4=BC=81=E4=B8=9A=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/info/app/AppUserController.java | 5 ++++ .../info/command/query/UserQueryExe.java | 24 +++++++++++++++++++ .../basic/info/service/UserServiceImpl.java | 5 ++++ .../zcloud/basic/info/api/UserServiceI.java | 1 + 4 files changed, 35 insertions(+) diff --git a/web-adapter/src/main/java/com/zcloud/basic/info/app/AppUserController.java b/web-adapter/src/main/java/com/zcloud/basic/info/app/AppUserController.java index 836df02c..d3df2cd6 100644 --- a/web-adapter/src/main/java/com/zcloud/basic/info/app/AppUserController.java +++ b/web-adapter/src/main/java/com/zcloud/basic/info/app/AppUserController.java @@ -115,6 +115,11 @@ public class AppUserController { public SingleResponse login(@Validated @RequestBody UserAppLoginCmd cmd) { return SingleResponse.of(userService.login(cmd)); } + @ApiOperation("app获取用户在职企业-轮询") + @PostMapping("/getUserCorpByPhone") + public SingleResponse getUserCorpByPhone(@Validated @RequestBody UserAppLoginCmd cmd) { + return SingleResponse.of(userService.getUserCorpByPhone(cmd)); + } @ApiOperation("app获取用户在职企业") @PostMapping("/getUserCorpList/{id}") public MultiResponse getUserCorpList(@PathVariable("id") Long id) { diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/query/UserQueryExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/query/UserQueryExe.java index e8eabcd8..3f740502 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/query/UserQueryExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/query/UserQueryExe.java @@ -267,6 +267,28 @@ public class UserQueryExe { userLoginCO.setUserCO(userCoConvertor.converDOToCO(userDO)); return userLoginCO; } + public UserLoginCO getUserCorpByPhone(UserAppLoginCmd cmd) { + UserLoginCO userLoginCO = new UserLoginCO(); + //返回企业列表 + //根据手机号获取用户列表 + List userDOList = userRepository.getListByPhone(cmd.getPhone(),null); + if(CollUtil.isEmpty(userDOList)){ + throw new BizException("用户不存在"); + } + //获取在职的用户取第一个 + UserDO userDO = userDOList.stream().filter(userDO1 -> UserEmploymentFlagEnum.ON.getCode().equals(userDO1.getEmploymentFlag())).findFirst().orElse(null); + if(userDO == null){ + userDO = userDOList.get(0); + } + + List userIds = userDOList.stream().map(UserDO::getId).collect(Collectors.toList()); + List userCorpDOS = userRepository.getListByUserIds(userIds); + List corpInfoCOS = corpInfoCoConvertor.converUserInfoDOsToCOs(userCorpDOS); + + userLoginCO.setUserCorpInfoCOList(corpInfoCOS); + userLoginCO.setUserCO(userCoConvertor.converDOToCO(userDO)); + return userLoginCO; + } public List getUserCorpList(Long id) { //返回企业列表 @@ -310,5 +332,7 @@ public class UserQueryExe { return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); } + + } diff --git a/web-app/src/main/java/com/zcloud/basic/info/service/UserServiceImpl.java b/web-app/src/main/java/com/zcloud/basic/info/service/UserServiceImpl.java index 4cc33323..ca125b62 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/service/UserServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/basic/info/service/UserServiceImpl.java @@ -213,6 +213,11 @@ public class UserServiceImpl implements UserServiceI { } + @Override + public UserLoginCO getUserCorpByPhone(UserAppLoginCmd cmd) { + return userQueryExe.getUserCorpByPhone(cmd); + } + @Override public List getUserCorpList(Long id) { return userQueryExe.getUserCorpList(id); diff --git a/web-client/src/main/java/com/zcloud/basic/info/api/UserServiceI.java b/web-client/src/main/java/com/zcloud/basic/info/api/UserServiceI.java index 12e3c970..b5c25f3d 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/api/UserServiceI.java +++ b/web-client/src/main/java/com/zcloud/basic/info/api/UserServiceI.java @@ -91,5 +91,6 @@ public interface UserServiceI { List getUserList(); + UserLoginCO getUserCorpByPhone(UserAppLoginCmd cmd); }