Browse Source

Merge remote-tracking branch 'origin/develop' into develop

lijie 3 years ago
parent
commit
c5a6f7929b

+ 1 - 0
src/main/java/com/persagy/proxy/report/controller/RelationReportController.java

@@ -512,6 +512,7 @@ public class RelationReportController {
 			List<ObjectNode> relationObjects = new ArrayList<ObjectNode>();
 			
 			String groupCode = request.getHeader(AdmCommonConstant.GROUP_CODE_HEADER);
+			groupCode = StrUtil.isBlank(groupCode) ? defaultCode : groupCode;
 			String projectId = request.getHeader(AdmCommonConstant.PROJECT_ID_HEADER);
 			
 			workbook = new XSSFWorkbook(file.getInputStream());