Przeglądaj źródła

档案柜,测试数据异常捕捉

qianxb 1 rok temu
rodzic
commit
0833eabc9c

+ 17 - 13
blade-service/blade-archive/src/main/java/org/springblade/archive/controller/ArchivesAutoController.java

@@ -156,20 +156,24 @@ public class ArchivesAutoController extends BladeController {
 			@ApiImplicitParam(name = "nodeIds", value = "搜索树的节点id集合")
 	})
 	public R pageByArchivesAuto(ArchivesAutoVO archivesAuto) {
-		if (archivesAuto.getListType() == 1) {
-			IPage<ArchivesAutoVO> pages = archivesAutoService.pageByArchivesAuto(archivesAuto);
-			return R.data(pages);
-		}else {
-			//档案柜
-			if(archivesAuto.getCabinetNumber() == null) {
-				List<Map<String, List<Map<String, String>>>> lists = archivesAutoService.getArchivesCabinet(archivesAuto);
-				return R.data(lists);
-			}else {
-				//查询具体柜子里的数据
-				archivesAuto.setSize(160);
-				archivesAuto.setCurrent(archivesAuto.getCabinetNumber());
-				return archivesAutoService.pageByArchivesAuto2(archivesAuto);
+		try {
+			if (archivesAuto.getListType() == 1) {
+				IPage<ArchivesAutoVO> pages = archivesAutoService.pageByArchivesAuto(archivesAuto);
+				return R.data(pages);
+			} else {
+				//档案柜
+				if (archivesAuto.getCabinetNumber() == null) {
+					List<Map<String, List<Map<String, String>>>> lists = archivesAutoService.getArchivesCabinet(archivesAuto);
+					return R.data(lists);
+				} else {
+					//查询具体柜子里的数据
+					archivesAuto.setSize(160);
+					archivesAuto.setCurrent(archivesAuto.getCabinetNumber());
+					return archivesAutoService.pageByArchivesAuto2(archivesAuto);
+				}
 			}
+		}catch (Exception e){
+			return R.data(null);
 		}
 	}