Merge branch 'dev' into pre-production

blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java

@@ -516,7 +516,10 @@ public class ClassifyServiceImpl extends BaseServiceImpl<ClassifyMapper, Classif
 	}
 
 	private List<ClassifyApiVO> getClassifyList(Long pid,String exAdminDeptId) {
-		List<Long> list = Func.toLongList(exAdminDeptId);
+		List<Long> list = null;
+		if (Func.isNotEmpty(exAdminDeptId)){
+			list = Func.toLongList(exAdminDeptId);
+		}
 		return baseMapper.selectAllClassifyList(pid,list);
 	}
 }