Browse Source

保养工单分列页表查询默认显示所有工单,通过选择工单分类来查询代办和相关

sl 1 year ago
parent
commit
5e634910c2

+ 5 - 2
module_cmms/src/main/java/org/jeecg/modules/cmmsUpkeep/controller/CmmsUpkeepController.java

@@ -112,12 +112,15 @@ public class CmmsUpkeepController extends JeecgController<CmmsUpkeep, ICmmsUpkee
 //		IPage<CmmsUpkeep> pageList = cmmsUpkeepService.page(page, queryWrapper);
 		List<CmmsUpkeepDto> pageList = new ArrayList<>();
 		//0我的相关  1我的代办
-		if(cmmsUpkeepDto.getCmmsUpkeepType().equals("0")){
+		if(cmmsUpkeepDto.getCmmsUpkeepType()!=null && cmmsUpkeepDto.getCmmsUpkeepType().equals("0")){
 			System.out.println("0");
 			pageList = cmmsUpkeepService.selectMyRelateList(page, cmmsUpkeepDto);
-		}else if(cmmsUpkeepDto.getCmmsUpkeepType().equals("1")){
+		}else if(cmmsUpkeepDto.getCmmsUpkeepType()!=null && cmmsUpkeepDto.getCmmsUpkeepType().equals("1")){
 			System.out.println("1");
 			pageList = cmmsUpkeepService.selectMyChargeList(page, cmmsUpkeepDto);
+		}else{
+			System.out.println("默认");
+			pageList = cmmsUpkeepService.selectMyRelateList(page, cmmsUpkeepDto);
 		}
 		page.setRecords(pageList);
 		return Result.OK(page);