Browse Source

兼容字段查询接口./rwd/def/class

lijie 3 years ago
parent
commit
aa2c57d15f

+ 11 - 0
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/define/controller/ObjectTypeController.java

@@ -3,8 +3,10 @@ package com.persagy.dmp.rwd.define.controller;
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.persagy.dmp.basic.model.QueryCriteria;
 import com.persagy.dmp.basic.utils.QueryCriteriaHelper;
+import com.persagy.dmp.common.constant.CommonConstant;
 import com.persagy.dmp.common.constant.ResponseCode;
 import com.persagy.dmp.common.exception.BusinessException;
 import com.persagy.dmp.common.model.response.CommonResult;
@@ -33,11 +35,20 @@ public class ObjectTypeController {
     @Autowired
     private IObjectTypeService service;
 
+    private final static String TYPE = "type";
+
     @PostMapping("")
     public CommonResult<List<ObjectTypeDefine>> query(@RequestBody QueryCriteria criteria) {
         if(criteria == null) {
             throw new BusinessException(ResponseCode.A0400.getCode(), ResponseCode.A0400.getDesc());
         }
+        // 2021年8月18日20:06:24 兼容旧的查询
+        ObjectNode objCriteria = criteria.getCriteria();
+        if (null!=objCriteria && objCriteria.size()>0){
+            if (objCriteria.has(TYPE) && CommonConstant.DEFAULT_ID.equals(objCriteria.get(TYPE).asText())){
+                objCriteria.remove(TYPE);
+            }
+        }
         QueryWrapper<ObjectTypeDefine> wrapper = new QueryWrapper<>();
         // 添加所属项目条件
         ConditionUtil.ensureProjectCriteria(wrapper);