修改重置密码提示bug

web-adapter/src/main/java/com/zcloud/basic/info/web/UserController.java

@@ -199,5 +199,9 @@ public class UserController {
     public SingleResponse<UserCO> getUserIdByPhone(@Validated @RequestBody GetUserIdByPhoneCmd getUserIdByPhoneCmd) {
         return userService.getUserIdByPhone(getUserIdByPhoneCmd);
     }
-
+    @ApiOperation("获取默认密码")
+    @PostMapping("/getDefaultPwd")
+    public SingleResponse getDefaultPwd(@Validated @RequestBody GetDefaultPwdCmd cmd) {
+        return userService.getDefaultPwd(cmd);
+    }
 }

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);
+    }
 }
 

web-app/src/main/java/com/zcloud/basic/info/service/UserServiceImpl.java

@@ -285,4 +285,9 @@ public class UserServiceImpl implements UserServiceI {
     public PageResponse<UserCO> pageByNopermissionAll(UserPageQry qry) {
         return userQueryExe.pageByNopermissionAll(qry);
     }
+
+    @Override
+    public SingleResponse getDefaultPwd(GetDefaultPwdCmd cmd) {
+        return userQueryExe.getDefaultPwd(cmd);
+    }
 }

web-client/src/main/java/com/zcloud/basic/info/api/UserServiceI.java

@@ -108,5 +108,8 @@ public interface UserServiceI {
     SingleResponse<Long> updateHumanUser(UserUpdateCmd userUpdateCmd);
 
     PageResponse<UserCO> pageByNopermissionAll(UserPageQry qry);
+
+
+    SingleResponse getDefaultPwd(GetDefaultPwdCmd cmd);
 }
 

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;
+
+
+
+}
+

web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/CorpInfoRepositoryImpl.java

@@ -101,8 +101,10 @@ public class CorpInfoRepositoryImpl extends BaseRepositoryImpl<CorpInfoMapper, C
         if(!ObjectUtils.isEmpty(params.get("menuId"))){
             List<ZcloudTenantTypeConfigCo> zttcc = zcloudTenantTypeConfigFacade.listTypeByMenuId(Long.valueOf(params.get("menuId").toString()));
             List<Integer> typeList = zttcc.stream().map(tc -> tc.getCode()).collect(Collectors.toList());
+            if(typeList != null && typeList.size() > 0){
                 queryWrapper.in("type",  typeList);
             }
+        }
         if (params.get("enterpriseTypeList") != null
                 && params.get("enterpriseTypeList") instanceof List){
             List<Integer> enterpriseTypeList = (List<Integer>) params.get("enterpriseTypeList");

web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java

@@ -753,6 +753,11 @@ public class UserRepositoryImpl extends BaseRepositoryImpl<UserMapper, UserDO> 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);