From fe60fdf166a568c3180b701a07c5be1992e67456 Mon Sep 17 00:00:00 2001 From: zhangyue Date: Thu, 20 Aug 2026 15:16:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=87=8D=E7=BD=AE=E5=AF=86?= =?UTF-8?q?=E7=A0=81=E6=8F=90=E7=A4=BAbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zcloud/basic/info/web/UserController.java | 8 ++++-- .../info/command/query/UserQueryExe.java | 21 +++++++++++--- .../basic/info/service/UserServiceImpl.java | 7 ++++- .../zcloud/basic/info/api/UserServiceI.java | 3 ++ .../basic/info/dto/GetDefaultPwdCmd.java | 28 +++++++++++++++++++ .../impl/CorpInfoRepositoryImpl.java | 4 ++- .../repository/impl/UserRepositoryImpl.java | 5 ++++ 7 files changed, 68 insertions(+), 8 deletions(-) create mode 100644 web-client/src/main/java/com/zcloud/basic/info/dto/GetDefaultPwdCmd.java 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 e10afe78..5e86bd7c 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 @@ -199,5 +199,9 @@ public class UserController { public SingleResponse getUserIdByPhone(@Validated @RequestBody GetUserIdByPhoneCmd getUserIdByPhoneCmd) { return userService.getUserIdByPhone(getUserIdByPhoneCmd); } - -} \ No newline at end of file + @ApiOperation("获取默认密码") + @PostMapping("/getDefaultPwd") + public SingleResponse getDefaultPwd(@Validated @RequestBody GetDefaultPwdCmd cmd) { + return userService.getDefaultPwd(cmd); + } +} 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 5eb0fa06..054e9008 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 @@ -20,10 +20,7 @@ import com.zcloud.basic.info.domain.gateway.UserGateway; import com.zcloud.basic.info.domain.model.UserE; import com.zcloud.basic.info.dto.*; import com.zcloud.basic.info.dto.clientobject.*; -import com.zcloud.basic.info.persistence.dataobject.UserCorpInfoDO; -import com.zcloud.basic.info.persistence.dataobject.UserDO; -import com.zcloud.basic.info.persistence.dataobject.UserExpandInfoDO; -import com.zcloud.basic.info.persistence.dataobject.UserImgDO; +import com.zcloud.basic.info.persistence.dataobject.*; import com.zcloud.basic.info.persistence.repository.CorpInfoRepository; import com.zcloud.basic.info.persistence.repository.UserExpandInfoRepository; import com.zcloud.basic.info.persistence.repository.UserRepository; @@ -405,5 +402,21 @@ public class UserQueryExe { return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); } + + public SingleResponse getDefaultPwd(GetDefaultPwdCmd cmd){ + Long corpinfoId = null; + // 如果 userid不为空，说明是重置用户密码，根据用户获取corpInfoid + if (!ObjectUtils.isEmpty(cmd.getUserId())){ + UserDO u = userRepository.getById(cmd.getUserId()); + corpinfoId = u.getCorpinfoId(); + } + // 如果 CorpinfoId，说明是重置企业主账号密码， + if(!ObjectUtils.isEmpty(cmd.getCorpinfoId())){ + corpinfoId = cmd.getCorpinfoId(); + } + CorpInfoDO corp = corpInfoRepository.getById(corpinfoId); + String pwd = zcloudTenantTypeConfigFacade.getPasswordByCode(corp.getType()); + return SingleResponse.of(pwd); + } } 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 3c97c73a..a2715c83 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 @@ -285,4 +285,9 @@ public class UserServiceImpl implements UserServiceI { public PageResponse pageByNopermissionAll(UserPageQry qry) { return userQueryExe.pageByNopermissionAll(qry); } -} \ No newline at end of file + + @Override + public SingleResponse getDefaultPwd(GetDefaultPwdCmd cmd) { + return userQueryExe.getDefaultPwd(cmd); + } +} 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 3ec1da70..35917900 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 @@ -108,5 +108,8 @@ public interface UserServiceI { SingleResponse updateHumanUser(UserUpdateCmd userUpdateCmd); PageResponse pageByNopermissionAll(UserPageQry qry); + + + SingleResponse getDefaultPwd(GetDefaultPwdCmd cmd); } diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/GetDefaultPwdCmd.java b/web-client/src/main/java/com/zcloud/basic/info/dto/GetDefaultPwdCmd.java new file mode 100644 index 00000000..6af5baef --- /dev/null +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/GetDefaultPwdCmd.java @@ -0,0 +1,28 @@ +package com.zcloud.basic.info.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.validation.constraints.NotEmpty; + +/** + * web-client + * + * @Author zhangyue + * @Date 2025-11-04 14:07:38 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +public class GetDefaultPwdCmd { + + private Long userId; + + private Long corpinfoId; + + + +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/CorpInfoRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/CorpInfoRepositoryImpl.java index e97a4287..d11c16a8 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/CorpInfoRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/CorpInfoRepositoryImpl.java @@ -101,7 +101,9 @@ public class CorpInfoRepositoryImpl extends BaseRepositoryImpl zttcc = zcloudTenantTypeConfigFacade.listTypeByMenuId(Long.valueOf(params.get("menuId").toString())); List typeList = zttcc.stream().map(tc -> tc.getCode()).collect(Collectors.toList()); - queryWrapper.in("type", typeList); + if(typeList != null && typeList.size() > 0){ + queryWrapper.in("type", typeList); + } } if (params.get("enterpriseTypeList") != null && params.get("enterpriseTypeList") instanceof List){ diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java index 08b769d9..77ee5d34 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java @@ -753,6 +753,11 @@ public class UserRepositoryImpl extends BaseRepositoryImpl i if (CollUtil.isNotEmpty(employmentFlagList)) { queryWrapper.in("employment_flag", employmentFlagList); } + + SSOUser ssoUser = AuthContext.getCurrentUser(); + if(ssoUser != null ){ + queryWrapper.eq("tenant_id", ssoUser.getTenantId()); + } queryWrapper.eq("user_id_card", userIdCard); queryWrapper.orderByAsc("create_time"); return list(queryWrapper);