Browse Source

fix : un-shaft-zoneSpaceBaseTable bug

lvxianyun 3 years ago
parent
commit
74cac48482

+ 3 - 11
src/main/java/com/persagy/proxy/object/controller/AdmShaftController.java

@@ -374,20 +374,12 @@ public class AdmShaftController {
     public AdmResponse queryUnZoneSp(@QueryParam("shaftId") String shaftId,
                              @RequestBody AdmQueryCriteria request) throws Exception {
         // 组装条件
-        QueryCriteria queryCriteria = AdmQueryCriteriaHelper.toDmpCriteria(request);
         if(!StrUtil.isNotEmpty(shaftId)) {
             return AdmResponse.failure("必填项:shaftId(竖井id)");
         }
-        ObjectNode criteria = JsonNodeFactory.instance.objectNode();
-        ObjectNode relationTO = JsonNodeFactory.instance.objectNode();
-        ArrayNode arrayNode = relationTO.putObject("objFrom").putArray("$notcontains");
-        arrayNode.add(shaftId);
-        relationTO.put("relCode", "Sh2Sp");
-        relationTO.put("graphCode","ArchSubset");
-        criteria.putPOJO("relationTo", relationTO);
-
-        criteria.put("objType", "space");
-        queryCriteria.setCriteria(relationTO);
+        request.setName(AdmSpace.OBJ_TYPE);
+        request.resetRelationCond(false, "ArchSubset", "Sh2Sp", AdmSpace.OBJ_TYPE, shaftId, false);
+        QueryCriteria queryCriteria = AdmQueryCriteriaHelper.toDmpCriteria(request);
         List<ObjectNode> spaceList = DigitalObjectFacade.query(AdmContextUtil.toDmpContext().getGroupCode(), AdmContextUtil.toDmpContext().getProjectId(), AdmContextUtil.toDmpContext().getAppId(), null, queryCriteria);
         if(CollUtil.isNotEmpty(spaceList)){
             List<AdmSpace> vos = JSONUtil.toList(spaceList.toString(), AdmSpace.class);