模型导入、导出逻辑优化

ibzdst-core/src/main/java/cn/ibizlab/core/extensions/service/MetaModelExService.java

@@ -231,10 +231,11 @@ public class MetaModelExService extends MetaModelServiceImpl {
         String strModel = JSON.toJSONString(models);
         File modelFile = generateModelFile(strModel);
         HttpServletResponse resp = ((ServletRequestAttributes) req).getResponse();
-        if (resp != null)
+        if (resp != null){
             resp.setContentType("APPLICATION/OCTET-STREAM");//返回格式为流
             resp.setHeader("Content-Disposition", "attachment;filename=" + getFileName(modelFile.getName()));
             sendResponse(resp, modelFile);
+        }
         return true;
     }
 
@@ -256,6 +257,7 @@ public class MetaModelExService extends MetaModelServiceImpl {
         //  查询模型
         MetaModel metaModel = metaModelService.get(et.getId());
         //  查询模型对应的N个规则
+        if(!ObjectUtils.isEmpty(metaModel.getRuleitems())){
             for (RuleItem ruleItem : metaModel.getRuleitems()) {
                 JSONObject fieldSet = JSONObject.parseObject(ruleItem.getFieldSet());
                 if (!ObjectUtils.isEmpty(fieldSet)) {
@@ -266,7 +268,7 @@ public class MetaModelExService extends MetaModelServiceImpl {
                     }
                 }
             }
-
+        }
         // 查询模型对应的N个(分析)构建
         if (!ObjectUtils.isEmpty(metaModel.getBuilds())) {
             for (DABuild build : metaModel.getBuilds()) {