|
@@ -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);
|