Browse Source

楼层贯通接口修改

yucheng 3 years ago
parent
commit
b66549e10b

+ 2 - 0
src/main/java/com/persagy/proxy/adm/service/impl/AbstractAdmBaseServiceImpl.java

@@ -11,6 +11,7 @@ import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.persagy.dmp.basic.model.QueryCriteria;
+import com.persagy.dmp.common.constant.ValidEnum;
 import com.persagy.dmp.common.helper.SpringHelper;
 import com.persagy.dmp.common.model.entity.BaseEntity;
 import com.persagy.dmp.common.utils.JsonHelper;
@@ -213,6 +214,7 @@ public class AbstractAdmBaseServiceImpl<T> implements IAdmBaseService<T> {
         ObjectNode criteria = JsonNodeFactory.instance.objectNode();
         queryRequest.setCriteria(criteria);
         boolean isSelectTo = anno.selectToObj();
+        criteria.put(BaseEntity.PROP_VALID, ValidEnum.TRUE.getType());
         putString(criteria, "graphCode", anno.graphCode());
         putString(criteria, "relCode", anno.relCode());
         putString(criteria, "relValue", anno.relValue());

+ 2 - 2
src/main/java/com/persagy/proxy/adm/utils/AdmQueryCriteriaHelper.java

@@ -10,8 +10,8 @@ import com.fasterxml.jackson.databind.node.JsonNodeFactory;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.persagy.dmp.basic.model.QueryCriteria;
 import com.persagy.dmp.basic.model.QueryOperator;
+import com.persagy.dmp.common.constant.ValidEnum;
 import com.persagy.dmp.common.model.entity.BaseEntity;
-import com.persagy.proxy.adm.constant.enums.ValidEnum;
 import com.persagy.proxy.adm.request.AdmQueryCriteria;
 
 import java.math.BigDecimal;
@@ -72,7 +72,7 @@ public class AdmQueryCriteriaHelper {
         }
         // 补充valid = 1
         if(!criteria.has(BaseEntity.PROP_VALID)) {
-            criteria.put(BaseEntity.PROP_VALID, ValidEnum.TRUE.getValue());
+            criteria.put(BaseEntity.PROP_VALID, ValidEnum.TRUE.getType());
         }
         // 补充关系条件
         if(admCriteria.getRelationFrom() != null) {