diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/innovationvoucher/controller/InnovationVoucherController.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/innovationvoucher/controller/InnovationVoucherController.java index 687ca27..cfa0190 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/innovationvoucher/controller/InnovationVoucherController.java +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/innovationvoucher/controller/InnovationVoucherController.java @@ -26,6 +26,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; @@ -137,6 +138,12 @@ public class InnovationVoucherController 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("pro_dept",ids); Page page = new Page(pageNo, pageSize); IPage pageList = innovationVoucherService.page(page, queryWrapper); return Result.OK(pageList); @@ -254,6 +261,12 @@ public class InnovationVoucherController 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("apply_dept",ids); Page page = new Page(pageNo, pageSize); IPage pageList = innovationVoucherService.page(page, queryWrapper); return Result.OK(pageList); 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 f636456..6d5364a 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; @@ -152,6 +153,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);