修改设备认领接口

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/EquipmentCategoryServiceImpl.java

@@ -553,16 +553,24 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
                     //企业
                     map.put("USE_UNIT_CREDIT_CODE", companyCode);
                      m= idxFeignService.getPage(map);
+                     map.remove("USE_UNIT_CREDIT_CODE");
                 } else {
                     //监管单位
                     map.put("ORG_BRANCH_CODE", code);
                     m = idxFeignService.getPage(map);
+                    map.remove("ORG_BRANCH_CODE");
+                }
+                if (!ValidationUtil.isEmpty(m)&&!ValidationUtil.isEmpty(m.getResult())&&!ValidationUtil.isEmpty(m.getResult().getRecords())) {
+                    res.addAll(m.getResult().getRecords());
                 }
             }
-            res.addAll(model.getResult().getRecords());
         }
 
-        model.getResult().setRecords(res);
+
+
+        Page<Map<String, Object>> objectPage = new Page<>();
+        objectPage.setRecords(res);
+        model.setResult(objectPage);
         if (!ValidationUtil.isEmpty(res)) {
             model.getResult().setTotal(res.size());
          }