From c769ef8243e707dd497d4938eb1f277888e8c269 Mon Sep 17 00:00:00 2001 From: sunzheng Date: Thu, 1 Aug 2024 18:55:15 +0800 Subject: [PATCH] =?UTF-8?q?update:=E4=BF=AE=E6=94=B9=E9=83=A8=E9=97=A8?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=9A=84=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SysDepartController.java | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/laws-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java b/laws-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java index 333187bf..80da4d55 100644 --- a/laws-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java +++ b/laws-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java @@ -45,6 +45,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.*; +import java.util.stream.Collectors; /** *

@@ -341,11 +342,26 @@ public class SysDepartController { */ @RequiresPermissions("sys:depart:export") @RequestMapping(value = "/exportXls") - public ModelAndView exportXls(SysDepart sysDepart,HttpServletRequest request) { - // Step.1 组装查询条件 + public ModelAndView exportXls(SysDepart sysDepart,HttpServletRequest request, + @RequestParam(name = "keyWord", required = false) String keyWord, + @RequestParam(name = "myDeptSearch", required = false) String myDeptSearch) { + List collectIds = new ArrayList<>(); + if (StringUtils.isNotBlank(keyWord)) { + LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + String departIds = null; + if(oConvertUtils.isNotEmpty(user.getUserIdentity()) && user.getUserIdentity().equals( CommonConstant.USER_IDENTITY_2 )){ + departIds = user.getDepartIds(); + } + List treeList = this.sysDepartService.searhBy(keyWord,myDeptSearch,departIds); + collectIds = treeList.stream().map(SysDepartTreeModel::getId).collect(Collectors.toList()); + } + // Step.1 组装查询条件 QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(sysDepart, request.getParameterMap()); //Step.2 AutoPoi 导出Excel ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); + if (!collectIds.isEmpty()) { + queryWrapper.in("id",collectIds); + } String selections = request.getParameter("selections"); if(!oConvertUtils.isEmpty(selections)){ queryWrapper.in("id",selections.split(","));