From 00d9e941a7ca2a76d3e6058edc9be090887098a1 Mon Sep 17 00:00:00 2001 From: zhangyue Date: Mon, 10 Nov 2025 16:17:47 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=8E=B7=E5=8F=96=E5=BD=93?= =?UTF-8?q?=E5=89=8D=E7=99=BB=E5=BD=95=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zcloud/basic/info/web/UserController.java | 5 +++++ .../basic/info/command/UserUpdateExe.java | 2 ++ .../info/command/query/UserQueryExe.java | 19 +++++++++++++++++++ .../basic/info/service/UserServiceImpl.java | 5 +++++ .../zcloud/basic/info/api/UserServiceI.java | 2 +- .../info/dto/UserEmploymentLogPageQry.java | 5 ++++- 6 files changed, 36 insertions(+), 2 deletions(-) diff --git a/web-adapter/src/main/java/com/zcloud/basic/info/web/UserController.java b/web-adapter/src/main/java/com/zcloud/basic/info/web/UserController.java index 56d3671..9dcfb9c 100644 --- a/web-adapter/src/main/java/com/zcloud/basic/info/web/UserController.java +++ b/web-adapter/src/main/java/com/zcloud/basic/info/web/UserController.java @@ -88,6 +88,11 @@ public class UserController { public SingleResponse getInfoById(@PathVariable("id") Long id) { return userService.getInfoById(id); } + @ApiOperation("获取当前登录人信息") + @GetMapping("/getInfo") + public SingleResponse getInfo() { + return userService.getInfoBySession(); + } @ApiOperation("删除") @DeleteMapping("/{id}") diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/UserUpdateExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/UserUpdateExe.java index a1863a8..b19bf59 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/UserUpdateExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/UserUpdateExe.java @@ -42,6 +42,7 @@ public class UserUpdateExe { public void execute(UserUpdateCmd userUpdateCmd) { UserE userE = new UserE(); BeanUtils.copyProperties(userUpdateCmd, userE); + // 对比用户老数据与要修改数据，查看是否涉及调岗及入职 UserDO userDO = userRepository.getInfoById(userUpdateCmd.getId()); UserE oldUserE = new UserE(); BeanUtils.copyProperties(userDO, oldUserE); @@ -51,6 +52,7 @@ public class UserUpdateExe { boolean res = false; try { res = userGateway.update(userE); + // 保存履职记录 if (transferPositionFlag) { UserEmploymentLogE userEmploymentLogE = new UserEmploymentLogE(); CorpInfoDO corpInfoDO = corpInfoRepository.getById(userE.getCorpinfoId()); 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 2fead95..6739a72 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 @@ -5,6 +5,8 @@ import com.alibaba.cola.dto.PageResponse; import com.alibaba.cola.dto.Response; import com.alibaba.cola.dto.SingleResponse; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.jjb.saas.framework.auth.model.SSOUser; +import com.jjb.saas.framework.auth.utils.AuthContext; import com.zcloud.basic.info.command.convertor.UserCoConvertor; import com.zcloud.basic.info.domain.gateway.UserGateway; import com.zcloud.basic.info.domain.model.UserE; @@ -127,5 +129,22 @@ public class UserQueryExe { UserE userE = new UserE(); userE.exportUserTable(httpServletResponse, userExcelExportEntities); } + + + + /** + * 详情 + * + * + * @return + */ + public SingleResponse executeGetInfoBySession() { + SSOUser ssoUser = AuthContext.getCurrentUser(); + Long id = ssoUser.getUserId(); + UserDO userDO = userRepository.getInfoById(id); + UserCO userCO = new UserCO(); + BeanUtils.copyProperties(userDO, userCO); + return SingleResponse.of(userCO); + } } 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 ee35c75..d0f05d7 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 @@ -103,5 +103,10 @@ public class UserServiceImpl implements UserServiceI { return userQueryExe.executeVerifyUser(userVerifyQryCmd); } + @Override + public SingleResponse getInfoBySession() { + return userQueryExe.executeGetInfoBySession(); + } + } 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 2e3c02e..d63bd56 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 @@ -42,7 +42,7 @@ public interface UserServiceI { SingleResponse getInfoById(Long id); Response verifyUser(UserVerifyQryCmd userVerifyQryCmd); - + SingleResponse getInfoBySession(); UserCO getInfoByUserId(Long aLong); } diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/UserEmploymentLogPageQry.java b/web-client/src/main/java/com/zcloud/basic/info/dto/UserEmploymentLogPageQry.java index 9b14b6f..b2fdf71 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/UserEmploymentLogPageQry.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/UserEmploymentLogPageQry.java @@ -23,6 +23,9 @@ public class UserEmploymentLogPageQry extends PageQuery { * - `le`: 小于等于比较查询 * - `ne`: 不等比较查询，对应SQL的!=操作符 */ - private String likeUserEmploymentLogId; + private Long eqUserId; + private Long eqCorpinfoId; + private Long eqDepartmentId; + private Long eqPostId; }