From b01cec137557ab7cc438484d7257a4dc1796ab2a Mon Sep 17 00:00:00 2001 From: SondonYong Date: Thu, 13 Nov 2025 10:56:39 +0800 Subject: [PATCH] =?UTF-8?q?dev:=E5=AF=BC=E5=87=BA=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/zcloud/basic/info/web/UserController.java | 14 +++----------- .../basic/info/command/query/UserQueryExe.java | 11 ++++------- .../zcloud/basic/info/service/UserServiceImpl.java | 4 ++-- .../com/zcloud/basic/info/api/UserServiceI.java | 2 +- .../com/zcloud/basic/info/dto/UserExportQry.java | 7 +++---- .../com/zcloud/basic/info/domain/model/UserE.java | 2 +- 6 files changed, 14 insertions(+), 26 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 08ca347..a830526 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 @@ -117,17 +117,9 @@ public class UserController { } @ApiOperation("导出用户列表") - @PostMapping("/exportUserTable") - public void exportUserTable(@Validated @RequestBody UserExportQry qry, HttpServletResponse httpServletResponse) { - List dataIds = Collections.emptyList(); - if(qry.getIds() != null && qry.getIds().length > 0){ - dataIds = Arrays.stream(qry.getIds()) - .filter(Objects::nonNull) // 过滤掉null - .filter(str -> !str.trim().isEmpty()) // 过滤掉空字符串 - .map(Long::valueOf) - .collect(Collectors.toList()); - } - userService.exportUserTable(httpServletResponse, dataIds, Long.valueOf(qry.getCorpinfoId())); + @GetMapping("/exportUserTable") + public void exportUserTable(@RequestParam(value = "ids") Long[] ids, HttpServletResponse httpServletResponse) { + userService.exportUserTable(httpServletResponse, ids, AuthContext.getTenantId()); } @ApiOperation("导入用户列表") 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 6739a72..1d5dfc8 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 @@ -23,10 +23,7 @@ import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Component; import javax.servlet.http.HttpServletResponse; -import java.util.Collection; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** @@ -118,11 +115,11 @@ public class UserQueryExe { /** * 导出用户 */ - public void exportUserTable(HttpServletResponse httpServletResponse, List dataIds, Long corpinfoId) { + public void exportUserTable(HttpServletResponse httpServletResponse, Long[] ids, Long corpinfoId) { Map params = new HashMap<>(); params.put("corpinfoId", corpinfoId); - if(dataIds != null && !dataIds.isEmpty()) { - params.put("userIdList", dataIds); + if(ids != null && ids.length > 0) { + params.put("userIdList", Arrays.asList(ids)); } List userDOList = userRepository.listAll(params); List userExcelExportEntities = userCoConvertor.converDOsToExcelEntitys(userDOList); 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 b96017c..164e48b 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 @@ -59,8 +59,8 @@ public class UserServiceImpl implements UserServiceI { } @Override - public void exportUserTable(HttpServletResponse httpServletResponse, List dataIds, Long corpinfoId) { - userQueryExe.exportUserTable(httpServletResponse, dataIds, corpinfoId); + public void exportUserTable(HttpServletResponse httpServletResponse, Long[] ids, Long corpinfoId) { + userQueryExe.exportUserTable(httpServletResponse, ids, corpinfoId); } @Override 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 f0ff51f..6e3b114 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 @@ -27,7 +27,7 @@ public interface UserServiceI { void edit(UserUpdateCmd cmd); - void exportUserTable(HttpServletResponse httpServletResponse, List dataIds, Long corpinfoId); + void exportUserTable(HttpServletResponse httpServletResponse, Long[] ids, Long corpinfoId); void importUserTable(MultipartFile file); diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/UserExportQry.java b/web-client/src/main/java/com/zcloud/basic/info/dto/UserExportQry.java index e9bb1ad..ced3379 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/UserExportQry.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/UserExportQry.java @@ -27,11 +27,10 @@ public class UserExportQry extends PageQuery { * - `ne`: 不等比较查询，对应SQL的!=操作符 */ @ApiModelProperty(value = "人员id列表", name = "ids") - private String[] ids; + private Long[] ids; - @ApiModelProperty(value = "企业id", name = "corpinfoId", required = true) - @NotEmpty(message = "企业id不能为空") - private String corpinfoId; + @ApiModelProperty(value = "企业id", name = "eqCorpinfoId") + private String eqCorpinfoId; } diff --git a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserE.java b/web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserE.java index ffa1b88..7bc938f 100644 --- a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserE.java +++ b/web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserE.java @@ -278,7 +278,7 @@ public class UserE extends BaseE { } if(CollUtil.isNotEmpty(errList)){ - throw new BizException("导入信息有误，请检查后重新导入。", String.join("", errList)); + throw new BizException("导入信息有误，请检查后重新导入。错误信息:" + String.join("", errList)); } // 映射