Merge remote-tracking branch 'origin/master'

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

@@ -7,6 +7,10 @@ import cn.ibizlab.core.dict.extensions.service.DictDstService;
 import cn.ibizlab.core.extensions.cql.ExecResult;
 import cn.ibizlab.core.extensions.cql.ExecResultRepository;
 import cn.ibizlab.core.extensions.domain.FetchMetricDatasParam;
+import cn.ibizlab.core.lite.domain.MetaModel;
+import cn.ibizlab.core.lite.extensions.domain.EntityModel;
+import cn.ibizlab.core.lite.extensions.model.DataModel;
+import cn.ibizlab.core.lite.extensions.service.LiteModelService;
 import cn.ibizlab.core.rule.domain.RuleItem;
 import cn.ibizlab.util.dict.CodeItem;
 import cn.ibizlab.util.errors.BadRequestAlertException;
@@ -55,6 +59,8 @@ public class DACoreService {
     @Autowired
     @Lazy
     private RuleItemExService ruleItemExService;
+    @Autowired
+    private LiteModelService liteModelService;
 
     /**
      * 通过指标、维度、时间获取相应的规则结果数据
@@ -1048,6 +1054,17 @@ public class DACoreService {
                 RuleItem dstRule = this.ruleItemExService.getById(strField);
                 if (dstRule != null) {
                     String strEntityName = dstRule.getRuleName();
+                    MetaModel model = dstRule.getModel();
+                    if (!StringUtils.isEmpty(model)){
+                        String modelid = model.getId();
+                        DataModel dataModel = liteModelService.getDataModel(modelid);
+                        if (dataModel != null){
+                            EntityModel entityModel = dataModel.getFactEntityModel();
+                            if (entityModel != null && entityModel.getEntity() != null){
+                                strEntityName = entityModel.getEntity().getEntityName();
+                            }
+                        }
+                    }
                     cellJson.put("entity", strEntityName);
                 }
             } else {