仪器申请审核BUG

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<Instrument, IInstrumen
 		 	//县区管理员角色
 			 queryWrapper.in("state",1,2,3);
 			 queryWrapper.in("flag",1,2);
+			 QueryWrapper<SysDepart> queryWrappersd = new QueryWrapper();
+			 queryWrappersd.eq("del_flag", 0);
+			 queryWrappersd.eq("parent_id", loginUser.getOrgId());
+			 List<SysDepart> listsd = sysDepartService.list(queryWrappersd);
+			 List<String> ids = listsd.stream().map(SysDepart::getId).collect(Collectors.toList());
+			 queryWrapper.in("declaration_unit",ids);
 			 Page<Instrument> page = new Page<Instrument>(pageNo, pageSize);
 			 IPage<Instrument> pageList = instrumentService.page(page, queryWrapper);
 			 return Result.OK(pageList);