非层级管控数据，项目过滤条件处理

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

@@ -57,7 +57,7 @@ public class ObjectDigitalController{
 
         QueryWrapper<ObjectDigital> wrapper = new QueryWrapper<>();
         // 添加所属项目条件
-        ConditionUtil.ensureProjectCriteria(wrapper);
+        ConditionUtil.ensureProjectCriteriaDirectly(wrapper);
         // 处理扩展条件
         ObjectDigitalCriteriaHelper.presetDigitalCriteria(criteria);
         // 转换查询条件

dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/controller/ObjectRelationController.java

@@ -47,7 +47,7 @@ public class ObjectRelationController {
 
         QueryWrapper<ObjectRelation> wrapper = new QueryWrapper<>();
         // 添加所属项目条件
-        ConditionUtil.ensureProjectCriteria(wrapper);
+        ConditionUtil.ensureProjectCriteriaDirectly(wrapper);
         // 转换查询条件
         QueryCriteriaHelper.toWrapper(wrapper, criteria, ObjectRelation.class);
         Page page = QueryCriteriaHelper.toPage(criteria);
@@ -124,7 +124,7 @@ public class ObjectRelationController {
         }
         QueryWrapper<ObjectRelation> wrapper = new QueryWrapper<>();
         // 添加所属项目条件
-        ConditionUtil.ensureProjectCriteria(wrapper);
+        ConditionUtil.ensureProjectCriteriaDirectly(wrapper);
         // 转换查询条件
         QueryCriteriaHelper.toWrapper(wrapper, criteria, ObjectRelation.class);
         List<ObjectRelation> delList = service.delete(wrapper);

dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/iot/service/impl/CurrentIotServiceImpl.java

@@ -137,7 +137,7 @@ public class CurrentIotServiceImpl implements CurrentIotService {
         //查询object对象
         QueryWrapper<ObjectDigital> wrapper = new QueryWrapper<>();
         // 添加所属项目条件
-        ConditionUtil.ensureProjectCriteria(wrapper);
+        ConditionUtil.ensureProjectCriteriaDirectly(wrapper);
         // 转换查询条件
         QueryCriteriaHelper.toWrapper(wrapper,queryCriteria, ObjectDigital.class);
         List<ObjectDigital> data = objectDigitalService.queryByCondition(wrapper);

dmp-comp/dmp-mybatis/src/main/java/com/persagy/dmp/mybatis/utils/ConditionUtil.java

@@ -21,7 +21,6 @@ public class ConditionUtil {
     /**
      * 确认项目范围条件
      * @param wrapper 查询条件
-     * @param wrapper 查询条件
      */
     public static <T extends BaseEntity> void ensureProjectCriteria(QueryWrapper<T> wrapper) {
         List<String> inSql = new ArrayList<>();
@@ -39,6 +38,16 @@ public class ConditionUtil {
     }
 
     /**
+     * 非层级管控数据拼接项目条件 - 当projectId为空时查所有
+     * @param wrapper
+     * @param <T>
+     */
+    public static <T extends BaseEntity> void ensureProjectCriteriaDirectly(QueryWrapper<T> wrapper) {
+        String projectId = AppContext.getContext().getProjectId();
+        wrapper.eq(StrUtil.isNotBlank(projectId), StrUtil.toUnderlineCase(AppContext.PROJECT_ID), projectId);
+    }
+
+    /**
      * 确认项目范围条件
      * @param wrapper 查询条件
      */