瀏覽代碼

fix bug:修复/rwd/instance/object/query接口查不到数据的问题

lijie 3 年之前
父節點
當前提交
e8fffec8aa

+ 3 - 5
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/controller/ObjectDigitalController.java

@@ -74,14 +74,12 @@ public class ObjectDigitalController{
         }
         QueryWrapper<ObjectDigital> wrapper = new QueryWrapper<>();
         // 添加所属项目条件
-        // ConditionUtil.ensureProjectCriteriaDirectly(wrapper);
         String projectId = AppContext.getContext().getProjectId();
-        if (null!=projectNode && projectNode.isArray()){
+        if (null!=projectNode && projectNode.isArray() && projectNode.size()>0){
             criteria.getCriteria().set(AppContext.PROJECT_ID,projectNode);
-            // wrapper.in(StrUtil.toUnderlineCase(AppContext.PROJECT_ID), JsonHelper.toMultiEntity(projectNode,String.class));
-        }else {
+        }
+        if (!criteria.getCriteria().has(AppContext.PROJECT_ID) && StrUtil.isNotBlank(projectId)){
             criteria.getCriteria().put(AppContext.PROJECT_ID,projectId);
-            //wrapper.eq(StrUtil.isNotBlank(projectId), StrUtil.toUnderlineCase(AppContext.PROJECT_ID), projectId);
         }
         // 处理扩展条件
         ObjectDigitalCriteriaHelper.presetDigitalCriteria(criteria);