From 3f4c923f4333588957feb1321958b1a75866fce7 Mon Sep 17 00:00:00 2001 From: Gitea Date: Fri, 8 Nov 2024 16:22:29 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=AA=E5=99=A8=E7=94=B3=E8=AF=B7=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../demo/instrument/controller/InstrumentController.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/instrument/controller/InstrumentController.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/instrument/controller/InstrumentController.java index d17a510..7ddfd6b 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/instrument/controller/InstrumentController.java +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/instrument/controller/InstrumentController.java @@ -27,6 +27,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; +import org.jeecg.modules.system.entity.SysDepart; import org.jeecg.modules.system.service.ISysDepartService; import org.jeecgframework.poi.excel.ExcelImportUtil; import org.jeecgframework.poi.excel.def.NormalExcelConstants; @@ -194,6 +195,12 @@ public class InstrumentController extends JeecgController queryWrappersd = new QueryWrapper(); + queryWrappersd.eq("del_flag", 0); + queryWrappersd.eq("parent_id", loginUser.getOrgId()); + List listsd = sysDepartService.list(queryWrappersd); + List ids = listsd.stream().map(SysDepart::getId).collect(Collectors.toList()); + queryWrapper.in("declaration_unit",ids); Page page = new Page(pageNo, pageSize); IPage pageList = instrumentService.page(page, queryWrapper); return Result.OK(pageList);