瀏覽代碼

fix bug:$or的查询无效问题

lijie 3 年之前
父節點
當前提交
7761754bcd

+ 4 - 2
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/controller/ObjectDigitalController.java

@@ -78,9 +78,11 @@ public class ObjectDigitalController{
         // ConditionUtil.ensureProjectCriteriaDirectly(wrapper);
         String projectId = AppContext.getContext().getProjectId();
         if (null!=projectNode && projectNode.isArray()){
-            wrapper.in(StrUtil.toUnderlineCase(AppContext.PROJECT_ID), JsonHelper.toMultiEntity(projectNode,String.class));
+            criteria.getCriteria().set(AppContext.PROJECT_ID,projectNode);
+            // wrapper.in(StrUtil.toUnderlineCase(AppContext.PROJECT_ID), JsonHelper.toMultiEntity(projectNode,String.class));
         }else {
-            wrapper.eq(StrUtil.isNotBlank(projectId), StrUtil.toUnderlineCase(AppContext.PROJECT_ID), projectId);
+            criteria.getCriteria().put(AppContext.PROJECT_ID,projectId);
+            //wrapper.eq(StrUtil.isNotBlank(projectId), StrUtil.toUnderlineCase(AppContext.PROJECT_ID), projectId);
         }
         // 处理扩展条件
         ObjectDigitalCriteriaHelper.presetDigitalCriteria(criteria);