|
@@ -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);
|